summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 096fa824d..d6218ff42 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include
set(FOLDERS
OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++ Bindings
WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs
+ Noise
)
SET (SRCS
@@ -50,7 +51,6 @@ SET (SRCS
MobProximityCounter.cpp
MobSpawner.cpp
MonsterConfig.cpp
- Noise.cpp
ProbabDistrib.cpp
RankManager.cpp
RCONServer.cpp
@@ -65,7 +65,8 @@ SET (SRCS
VoronoiMap.cpp
WebAdmin.cpp
World.cpp
- main.cpp)
+ main.cpp
+)
SET (HDRS
AllocationPool.h
@@ -103,7 +104,6 @@ SET (HDRS
Inventory.h
Item.h
ItemGrid.h
- LeakFinder.h
LightingThread.h
LineBlockTracer.h
LinearInterpolation.h
@@ -113,14 +113,12 @@ SET (HDRS
Map.h
MapManager.h
Matrix4.h
- MemoryLeak.h
MersenneTwister.h
MobCensus.h
MobFamilyCollecter.h
MobProximityCounter.h
MobSpawner.h
MonsterConfig.h
- Noise.h
ProbabDistrib.h
RankManager.h
RCONServer.h
@@ -128,7 +126,6 @@ SET (HDRS
Scoreboard.h
Server.h
SetChunkData.h
- StackWalker.h
Statistics.h
StringCompression.h
StringUtils.h
@@ -137,7 +134,8 @@ SET (HDRS
VoronoiMap.h
WebAdmin.h
World.h
- XMLParser.h)
+ XMLParser.h
+)
include_directories(".")
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
@@ -175,6 +173,10 @@ if (NOT MSVC)
else ()
# MSVC-specific handling: Put all files into one project, separate by the folders:
+ # Add the MSVC-specific LeakFinder sources:
+ list (APPEND SRCS LeakFinder.cpp StackWalker.cpp)
+ list (APPEND HDRS LeakFinder.h StackWalker.h MemoryLeak.h)
+
source_group(Bindings FILES "Bindings/Bindings.cpp" "Bindings/Bindings.h")
# Add all subfolders as solution-folders:
@@ -224,7 +226,7 @@ else ()
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\""
+ "StackWalker.cpp LeakFinder.cpp" PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""
)
list(APPEND SOURCE "Resources/MCServer.rc")
@@ -314,7 +316,7 @@ endif ()
if (NOT MSVC)
target_link_libraries(${EXECUTABLE}
- OSSupport HTTPServer Bindings Items Blocks
+ OSSupport HTTPServer Bindings Items Blocks Noise
Protocol Generating Generating_Prefabs WorldStorage
Mobs Entities Simulator UI BlockEntities PolarSSL++
)