From 44638cd24a608d8872663e5858cdf133599af6eb Mon Sep 17 00:00:00 2001
From: tycho <tycho@hanoverdesktop>
Date: Thu, 19 Dec 2013 23:37:24 +0000
Subject: fixed multiprocessing on windows and removed redundend compile of
 headers

---
 src/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e247df34e..847ca59d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,6 @@ endforeach(folder)
 
 file(GLOB_RECURSE SOURCE
     "*.cpp"
-	"*.h"
 )
 
 
-- 
cgit v1.2.3


From c7d766bbcc2594e9925c47d9a00141c0cff594c1 Mon Sep 17 00:00:00 2001
From: tycho <tycho@hanoverdesktop>
Date: Fri, 20 Dec 2013 00:22:06 +0000
Subject: fixed compile errors with headers and math library

---
 src/CMakeLists.txt | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 847ca59d5..4f70519bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,8 @@ function(includefolder PATH)
 		"${PATH}/*.cpp"
 		"${PATH}/*.h"
 	)
-	source_group("Source Files\\${PATH}" FILES ${FOLDER_FILES}) 
+	source_group("${PATH}" FILES ${FOLDER_FILES}) 
+
 endfunction(includefolder) 
 
 foreach(folder ${FOLDERS})
@@ -37,16 +38,24 @@ endforeach(folder)
 
 file(GLOB_RECURSE SOURCE
     "*.cpp"
+	"*.h"
 )
 
+source_group("" FILES ${SOURCE}) 
 
 endif()
 
 list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
 
-add_executable(../MCServer/MCServer ${SOURCE})
+if(UNIX)
+	set(EXECUTABLE ../MCServer/MCServer)
+else()
+	set(EXECUTABLE MCServer)
+endif()
+
+add_executable(${EXECUTABLE} ${SOURCE})
 
-target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks)
-target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp)
-target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities)
-target_link_libraries(../MCServer/MCServer md5 luaexpat)
+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)
-- 
cgit v1.2.3


From 162b085d803db549a0d70ce607f8ec0e025ebcf0 Mon Sep 17 00:00:00 2001
From: tycho <tycho@hanoverdesktop>
Date: Fri, 20 Dec 2013 00:31:52 +0000
Subject: fixed include paths on windows and added build dir to gitignore

---
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f70519bf..a557b7dac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,8 @@ file(GLOB_RECURSE SOURCE
 	"*.h"
 )
 
+include_directories("${PROJECT_SOURCE_DIR}")
+
 source_group("" FILES ${SOURCE}) 
 
 endif()
-- 
cgit v1.2.3