13 files changed, 45 insertions, 19 deletions

diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
index 4cd49c52d..d87594b0d 100644
--- a/src/BlockEntities/CMakeLists.txt
+++ b/src/BlockEntities/CMakeLists.txt
@@ -39,4 +39,6 @@ SET (HDRS
 	NoteEntity.h
 	SignEntity.h)
 
-add_library(BlockEntities ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(BlockEntities ${SRCS} ${HDRS})
+endif()
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index d356d151b..d7edf7f29 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -96,4 +96,6 @@ SET (HDRS
 	MetaRotator.h
 	WorldInterface.h)
 
-add_library(Blocks ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Blocks ${SRCS} ${HDRS})
+endif()
diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt
index 64752d13c..5d10e1680 100644
--- a/src/Entities/CMakeLists.txt
+++ b/src/Entities/CMakeLists.txt
@@ -60,6 +60,8 @@ SET (HDRS
 	ThrownSnowballEntity.h
 	WitherSkullEntity.h)
 
-add_library(Entities ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Entities ${SRCS} ${HDRS})
 
-target_link_libraries(Entities WorldStorage)
+	target_link_libraries(Entities WorldStorage)
+endif()
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index b3960914c..9063abd97 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -58,6 +58,8 @@ SET (HDRS
 	UnderwaterBaseGen.h
 	VillageGen.h)
 
-add_library(Generating ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Generating ${SRCS} ${HDRS})
 
-target_link_libraries(Generating OSSupport iniFile Blocks)
+	target_link_libraries(Generating OSSupport iniFile Blocks)
+endif()
diff --git a/src/Generating/Prefabs/CMakeLists.txt b/src/Generating/Prefabs/CMakeLists.txt
index d53098b4e..2c62aa73d 100644
--- a/src/Generating/Prefabs/CMakeLists.txt
+++ b/src/Generating/Prefabs/CMakeLists.txt
@@ -26,6 +26,8 @@ SET (HDRS
 	TestRailsPrefabs.h
 	UnderwaterBasePrefabs.h)
 
-add_library(Generating_Prefabs ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Generating_Prefabs ${SRCS} ${HDRS})
 
-target_link_libraries(Generating_Prefabs OSSupport iniFile Blocks)
+	target_link_libraries(Generating_Prefabs OSSupport iniFile Blocks)
+endif()
diff --git a/src/HTTPServer/CMakeLists.txt b/src/HTTPServer/CMakeLists.txt
index a15b2494f..b0efc810d 100644
--- a/src/HTTPServer/CMakeLists.txt
+++ b/src/HTTPServer/CMakeLists.txt
@@ -24,4 +24,6 @@ SET (HDRS
 	NameValueParser.h
 	SslHTTPConnection.h)
 
-add_library(HTTPServer ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(HTTPServer ${SRCS} ${HDRS})
+endif()
diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt
index 0c15a6944..12a467672 100644
--- a/src/Items/CMakeLists.txt
+++ b/src/Items/CMakeLists.txt
@@ -51,4 +51,6 @@ SET (HDRS
 	ItemSword.h
 	ItemThrowable.h)
 
-add_library(Items ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Items ${SRCS} ${HDRS})
+endif()
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index d73a7aafd..2c092c15f 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -73,4 +73,6 @@ SET (HDRS
 	Zombie.h
 	ZombiePigman.h)
 
-add_library(Mobs ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Mobs ${SRCS} ${HDRS})
+endif()
diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index 8004d4094..a42fcbed4 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -35,8 +35,10 @@ SET (HDRS
 	Thread.h
 	Timer.h)
 
-add_library(OSSupport ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(OSSupport ${SRCS} ${HDRS})
 
-if(UNIX)
-	target_link_libraries(OSSupport pthread)
+	if(UNIX)
+		target_link_libraries(OSSupport pthread)
+	endif()
 endif()
diff --git a/src/Protocol/CMakeLists.txt b/src/Protocol/CMakeLists.txt
index 21d49c516..ae447ce54 100644
--- a/src/Protocol/CMakeLists.txt
+++ b/src/Protocol/CMakeLists.txt
@@ -27,4 +27,6 @@ SET (HDRS
 	Protocol17x.h
 	ProtocolRecognizer.h)
 
-add_library(Protocol ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Protocol ${SRCS} ${HDRS})
+endif()
diff --git a/src/Simulator/CMakeLists.txt b/src/Simulator/CMakeLists.txt
index f56fb0079..521b145b6 100644
--- a/src/Simulator/CMakeLists.txt
+++ b/src/Simulator/CMakeLists.txt
@@ -32,4 +32,6 @@ SET (HDRS
 	VanillaFluidSimulator.h
 	VaporizeFluidSimulator.h)
 
-add_library(Simulator ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(Simulator ${SRCS} ${HDRS})
+endif()
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index c41123318..2b094ef1d 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -13,4 +13,6 @@ SET (HDRS
 	Window.h
 	WindowOwner.h)
 
-add_library(UI ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(UI ${SRCS} ${HDRS})
+endif()
diff --git a/src/WorldStorage/CMakeLists.txt b/src/WorldStorage/CMakeLists.txt
index 212581400..a00ff3b2f 100644
--- a/src/WorldStorage/CMakeLists.txt
+++ b/src/WorldStorage/CMakeLists.txt
@@ -30,6 +30,8 @@ SET (HDRS
 	WSSCompact.h
 	WorldStorage.h)
 
-add_library(WorldStorage ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(WorldStorage ${SRCS} ${HDRS})
 
-target_link_libraries(WorldStorage OSSupport)
+	target_link_libraries(WorldStorage OSSupport)
+endif()