From 06bef093bf3a035e03bf22808e82f8d82638dbfc Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 00:20:38 -0700
Subject: Generating/CMakeLists.txt: Replaced glob with list of files

---
 src/Generating/CMakeLists.txt | 59 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 5 deletions(-)

(limited to 'src/Generating')

diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index 3dacb5066..b3960914c 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -4,11 +4,60 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	BioGen.cpp
+	Caves.cpp
+	ChunkDesc.cpp
+	ChunkGenerator.cpp
+	CompoGen.cpp
+	ComposableGenerator.cpp
+	DistortedHeightmap.cpp
+	EndGen.cpp
+	FinishGen.cpp
+	GridStructGen.cpp
+	HeiGen.cpp
+	MineShafts.cpp
+	NetherFortGen.cpp
+	Noise3DGenerator.cpp
+	POCPieceGenerator.cpp
+	PieceGenerator.cpp
+	Prefab.cpp
+	PrefabPiecePool.cpp
+	RainbowRoadsGen.cpp
+	Ravines.cpp
+	StructGen.cpp
+	TestRailsGen.cpp
+	Trees.cpp
+	UnderwaterBaseGen.cpp
+	VillageGen.cpp)
 
-add_library(Generating ${SOURCE})
+SET (HDRS
+	BioGen.h
+	Caves.h
+	ChunkDesc.h
+	ChunkGenerator.h
+	CompoGen.h
+	ComposableGenerator.h
+	DistortedHeightmap.h
+	EndGen.h
+	FinishGen.h
+	GridStructGen.h
+	HeiGen.h
+	MineShafts.h
+	NetherFortGen.h
+	Noise3DGenerator.h
+	POCPieceGenerator.h
+	PieceGenerator.h
+	Prefab.h
+	PrefabPiecePool.h
+	RainbowRoadsGen.h
+	Ravines.h
+	StructGen.h
+	TestRailsGen.h
+	Trees.h
+	UnderwaterBaseGen.h
+	VillageGen.h)
+
+add_library(Generating ${SRCS} ${HDRS})
 
 target_link_libraries(Generating OSSupport iniFile Blocks)
-- 
cgit v1.2.3


From de48688fdbca822a09a9b8abad2010768ab36a20 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 00:34:21 -0700
Subject: Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files

---
 src/Generating/Prefabs/CMakeLists.txt | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'src/Generating')

diff --git a/src/Generating/Prefabs/CMakeLists.txt b/src/Generating/Prefabs/CMakeLists.txt
index a1f09112d..d53098b4e 100644
--- a/src/Generating/Prefabs/CMakeLists.txt
+++ b/src/Generating/Prefabs/CMakeLists.txt
@@ -4,11 +4,28 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	AlchemistVillagePrefabs.cpp
+	JapaneseVillagePrefabs.cpp
+	NetherFortPrefabs.cpp
+	PlainsVillagePrefabs.cpp
+	RainbowRoadPrefabs.cpp
+	SandFlatRoofVillagePrefabs.cpp
+	SandVillagePrefabs.cpp
+	TestRailsPrefabs.cpp
+	UnderwaterBasePrefabs.cpp)
 
-add_library(Generating_Prefabs ${SOURCE})
+SET (HDRS
+	AlchemistVillagePrefabs.h
+	JapaneseVillagePrefabs.h
+	NetherFortPrefabs.h
+	PlainsVillagePrefabs.h
+	RainbowRoadPrefabs.h
+	SandFlatRoofVillagePrefabs.h
+	SandVillagePrefabs.h
+	TestRailsPrefabs.h
+	UnderwaterBasePrefabs.h)
+
+add_library(Generating_Prefabs ${SRCS} ${HDRS})
 
 target_link_libraries(Generating_Prefabs OSSupport iniFile Blocks)
-- 
cgit v1.2.3


From 725d1fd1e2995b1720673c280fea1125ac338b3c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 13:26:43 -0700
Subject: Subdirs: Only add_library if not using MSVC

---
 src/Generating/CMakeLists.txt         | 6 ++++--
 src/Generating/Prefabs/CMakeLists.txt | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/Generating')

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()
-- 
cgit v1.2.3