summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2014-08-21 21:31:31 +0200
committerSamuel Barney <samjbarney@gmail.com>2014-08-21 21:31:31 +0200
commitcceed5c5ebfd33bc0eca262fc3ca675d4e398518 (patch)
tree0e97bea7dc2a6a4d0afa68a5799e200425e7c6f9
parentAdded components. (diff)
downloadcuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar.gz
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar.bz2
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar.lz
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar.xz
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.tar.zst
cuberite-cceed5c5ebfd33bc0eca262fc3ca675d4e398518.zip
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/Mobs/CMakeLists.txt1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6484cd2e5..36ab8cf4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,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
+ WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs Mobs/Components
)
SET (SRCS
@@ -307,9 +307,8 @@ endif ()
if (NOT MSVC)
target_link_libraries(${EXECUTABLE}
OSSupport HTTPServer Bindings Items Blocks
- Protocol Generating Generating_Prefabs WorldStorage
+ Protocol Generating Generating_Prefabs WorldStorage Components
Mobs Entities Simulator UI BlockEntities PolarSSL++
- Components
)
endif ()
if (WIN32)
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index 5934a6616..572dab593 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -70,4 +70,3 @@ SET (HDRS
if(NOT MSVC)
add_library(Mobs ${SRCS} ${HDRS})
endif()
-add_subdirectory(Components)