1 files changed, 57 insertions, 48 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 00c3059b5..88e469b74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,72 +12,81 @@ include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include")
 set(FOLDERS OSSupport HTTPServer Bindings Items Blocks Protocol Generating) 
 set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities)
 
-if(NOT WIN32)
 
-foreach(folder ${FOLDERS})
-	add_subdirectory(${folder})
-endforeach(folder)
 
-file(GLOB SOURCE
-    "*.cpp"
-)
-else()
+if (NOT WIN32)
+	foreach(folder ${FOLDERS})
+		add_subdirectory(${folder})
+	endforeach(folder)
 
-function(includefolder PATH)
-    FILE(GLOB FOLDER_FILES
-		"${PATH}/*.cpp"
-		"${PATH}/*.h"
+	file(GLOB SOURCE
+		"*.cpp"
 	)
-	source_group("${PATH}" FILES ${FOLDER_FILES}) 
 
-endfunction(includefolder) 
+	list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
 
-foreach(folder ${FOLDERS})
-	includefolder(${folder})
-endforeach(folder)
+else ()
 
-file(GLOB_RECURSE SOURCE
-    "*.cpp"
-	"*.h"
-)
+	function(includefolder PATH)
+		FILE(GLOB FOLDER_FILES
+			"${PATH}/*.cpp"
+			"${PATH}/*.h"
+		)
+		source_group("${PATH}" FILES ${FOLDER_FILES})
+	endfunction(includefolder)
 
-include_directories("${PROJECT_SOURCE_DIR}")
+	foreach(folder ${FOLDERS})
+		includefolder(${folder})
+	endforeach(folder)
 
-source_group("" FILES ${SOURCE}) 
-
-#precompiledheaders
+	file(GLOB_RECURSE SOURCE
+		"*.cpp"
+		"*.h"
+	)
 
-file(GLOB_RECURSE HEADERS
-	"*.h"
-)
+	include_directories("${PROJECT_SOURCE_DIR}")
 
-foreach(header ${HEADERS})
-	set(FLAGS "/Yu ${header} /Yc ${header}")
-	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
-	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_PROFILE   "${CMAKE_C_FLAGS_PROFILE}   ${FLAGS}")
-endforeach()
+	source_group("" FILES ${SOURCE})
 
+	# Precompiled headers (1st part)
+	SET_SOURCE_FILES_PROPERTIES(
+		Globals.cpp PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""
+	)
+	# CMake cannot "remove" the precompiled header flags, so we use a dummy precompiled header compatible with just this one file:
+	SET_SOURCE_FILES_PROPERTIES(
+		Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS "/Yc\"string.h\" /Fp\"$(IntDir)/Bindings.pch\""
+	)
+	SET_SOURCE_FILES_PROPERTIES(
+		"StackWalker.cpp LeakFinder.h" PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""
+	)
 endif()
 
-list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
 
-if(UNIX)
+if (UNIX)
 	set(EXECUTABLE ../MCServer/MCServer)
-else()
+else ()
 	set(EXECUTABLE MCServer)
-endif()
+endif ()
+
 
 add_executable(${EXECUTABLE} ${SOURCE})
 
-if(NOT WIN32)
-target_link_libraries(${EXECUTABLE} OSSupport HTTPServer Bindings Items Blocks)
-target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage)
-target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities)
+
+# Precompiled headers (2nd part)
+if (WIN32)
+	SET_TARGET_PROPERTIES(
+		${EXECUTABLE} PROPERTIES COMPILE_FLAGS "/Yu\"Globals.h\""
+		OBJECT_DEPENDS "$(IntDir)/$(TargetName.pch)"
+	)
+endif ()
+
+
+if (NOT WIN32)
+	target_link_libraries(${EXECUTABLE} OSSupport HTTPServer Bindings Items Blocks)
+	target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage)
+	target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities)
+endif ()
+if (WIN32)
+	target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib)
 endif()
-target_link_libraries(${EXECUTABLE} md5 luaexpat iniFile jsoncpp cryptopp zlib lua)
+target_link_libraries(${EXECUTABLE} md5 luaexpat iniFile jsoncpp cryptopp zlib lua sqlite)