Merge branch 'master' of github.com:dragonblocks/dragonblocks_alpha

[dragonblocks_alpha.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2cc9ad44c0917917364c1bcbff96d7d045093487..0adb599d915c118d2c7d9ad405172cd39b7a8c32 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,8 +19,6 @@ link_libraries(
 
 set(DEPS_DIR "${CMAKE_SOURCE_DIR}/../deps/")
 
-add_compile_definitions(DRAGONTYPE_ENDIAN_HEADER="${CMAKE_SOURCE_DIR}/../deps/endian.h/endian.h")
-
 include_directories(SYSTEM
        ${DEPS_DIR}
 )
@@ -41,7 +39,18 @@ endif()
 
 add_compile_options(-Wall -Wextra -Wpedantic -Werror)
 
-set(SOURCES_COMMON
+set(DEPS_SOURCES
+       "${DEPS_DIR}/dragontype/array.c"
+       "${DEPS_DIR}/dragontype/bintree.c"
+       "${DEPS_DIR}/dragontype/list.c"
+       "${DEPS_DIR}/dragontype/number.c"
+       "${DEPS_DIR}/dragontype/queue.c"
+       "${DEPS_DIR}/dragonport/asprintf.c"
+       "${DEPS_DIR}/perlin/perlin.c"
+)
+
+set(COMMON_SOURCES
+       ${DEPS_SOURCES}
        day.c
        environment.c
        map.c
@@ -49,13 +58,10 @@ set(SOURCES_COMMON
        perlin.c
        signal_handlers.c
        util.c
-       "${DEPS_DIR}/dragontype/implementation.c"
-       "${DEPS_DIR}/dragonport/asprintf.c"
-       "${DEPS_DIR}/perlin/perlin.c"
 )
 
 add_executable(Dragonblocks
-       ${SOURCES_COMMON}
+       ${COMMON_SOURCES}
        client/blockmesh.c
        client/camera.c
        client/client.c
@@ -93,13 +99,15 @@ target_include_directories(Dragonblocks PUBLIC
 )
 
 add_executable(DragonblocksServer
-       ${SOURCES_COMMON}
+       ${COMMON_SOURCES}
        server/biomes.c
        server/database.c
        server/mapgen.c
        server/server.c
        server/server_commands.c
        server/server_map.c
+       server/trees.c
+       server/voxelctx.c
 )
 
 target_link_libraries(DragonblocksServer