From f6d5a788aa0498da70eb9693043625b35a54c387 Mon Sep 17 00:00:00 2001
From: tycho <tycho@hanoverdesktop>
Date: Fri, 20 Dec 2013 15:37:35 +0000
Subject: fixed include of math on windows

---
 src/Bindings/CMakeLists.txt | 2 +-
 src/CMakeLists.txt          | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 469daddec..41c641d9d 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../")
 #add any new generation dependencies here
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/AllToLua.pkg tolua
    )
-
+   
 #add cpp files here
 add_library(Bindings PluginManager LuaState WebPlugin Bindings ManualBindings LuaWindow Plugin PluginLua WebPlugin)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a557b7dac..9b461ff94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,6 +43,15 @@ file(GLOB_RECURSE SOURCE
 
 include_directories("${PROJECT_SOURCE_DIR}")
 
+ADD_CUSTOM_COMMAND(
+#add any new generated bindings here
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.h
+#command execuded to regerate bindings
+   COMMAND tolua -L virtual_method_hooks.lua -o Bindings/Bindings.cpp -H Bindings/Bindings.h AllToLua.pkg
+#add any new generation dependencies here
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg tolua
+   )
+
 source_group("" FILES ${SOURCE}) 
 
 endif()
-- 
cgit v1.2.3


From f739246e52e3385d1e133516fbe32aafeb16911d Mon Sep 17 00:00:00 2001
From: tycho <tycho@hanoverdesktop>
Date: Fri, 20 Dec 2013 16:05:12 +0000
Subject: added precompiled headers

---
 src/CMakeLists.txt | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b461ff94..00c3059b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,17 +43,26 @@ file(GLOB_RECURSE SOURCE
 
 include_directories("${PROJECT_SOURCE_DIR}")
 
-ADD_CUSTOM_COMMAND(
-#add any new generated bindings here
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.cpp ${CMAKE_CURRENT_BINARY_DIR}/Bindings/Bindings.h
-#command execuded to regerate bindings
-   COMMAND tolua -L virtual_method_hooks.lua -o Bindings/Bindings.cpp -H Bindings/Bindings.h AllToLua.pkg
-#add any new generation dependencies here
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg tolua
-   )
-
 source_group("" FILES ${SOURCE}) 
 
+#precompiledheaders
+
+file(GLOB_RECURSE HEADERS
+	"*.h"
+)
+
+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()
+
 endif()
 
 list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
@@ -66,7 +75,9 @@ endif()
 
 add_executable(${EXECUTABLE} ${SOURCE})
 
-target_link_libraries(${EXECUTABLE} OSSupport HTTPServer iniFile Bindings Items Blocks)
-target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage jsoncpp cryptopp)
-target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI zlib lua BlockEntities)
-target_link_libraries(${EXECUTABLE} md5 luaexpat)
+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()
+target_link_libraries(${EXECUTABLE} md5 luaexpat iniFile jsoncpp cryptopp zlib lua)
-- 
cgit v1.2.3