Use portable getline

[dragonblocks_alpha.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba84911f2ee4bd814546d698feb3e581a9b62161..896d84537a3078c66ca4163845d38253368952d6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,9 +16,26 @@ endif()
 # Dependencies
 
 find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
-find_package(glfw3 3.3 REQUIRED)
-find_package(Freetype REQUIRED)
+
+if(NOT GLEW_LIBRARIES OR NOT GLEW_INCLUDE_DIRS)
+       find_package(GLEW REQUIRED)
+endif()
+
+if(NOT GLFW_LIBRARIES OR NOT GLFW_INCLUDE_DIRS)
+       find_package(glfw3 3.3 REQUIRED)
+       set(GLFW_LIBRARIES glfw)
+       set(GLFW_INCLUDE_DIRS)
+endif()
+
+if(NOT FREETYPE_LIBRARIES OR NOT FREETYPE_INCLUDE_DIRS)
+       find_package(Freetype REQUIRED)
+endif()
+
+if(NOT ZLIB_LIBRARIES OR NOT ZLIB_INCLUDE_DIRS)
+       find_package(ZLIB REQUIRED)
+       set(ZLIB_LIBRARIES ZLIB::ZLIB)
+       set(ZLIB_INCLUDE_DIRS)
+endif()
 
 # Options
 
@@ -29,17 +46,18 @@ endif()
 add_compile_definitions("USE_DRAGONNET")
 add_compile_definitions("RESSOURCE_PATH=\"${RESSOURCE_PATH}\"")
 
-add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -fmax-errors=4)
+add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-maybe-uninitialized -fmax-errors=4)
 
 link_libraries(
        pthread
        m
-       z
+       ${ZLIB_LIBRARIES}
 )
 
 include_directories(SYSTEM ${DEPS_DIR})
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${ZLIB_INCLUDE_DIRS})
 
 # System specific options
 
@@ -72,12 +90,16 @@ set(COMMON_SOURCES
        "${DEPS_DIR}/dragonstd/refcount.c"
        "${DEPS_DIR}/dragonstd/tree.c"
        "${DEPS_DIR}/dragonstd/bits/compare.c"
+       "${DEPS_DIR}/getline/getline.c"
        "${DEPS_DIR}/linenoise/linenoise.c"
+       "${DEPS_DIR}/linenoise/stringbuf.c"
+       "${DEPS_DIR}/linenoise/utf8.c"
        "${DEPS_DIR}/perlin/perlin.c"
        color.c
        config.c
        day.c
        environment.c
+       facedir.c
        interrupt.c
        item.c
        node.c
@@ -103,7 +125,6 @@ add_executable(dragonblocks
        client/cube.c
        client/debug_menu.c
        client/facecache.c
-       client/facedir.c
        client/font.c
        client/frustum.c
        client/game.c
@@ -126,11 +147,13 @@ add_executable(dragonblocks
 target_link_libraries(dragonblocks
        ${OPENGL_LIBRARIES}
        ${GLEW_LIBRARIES}
-       glfw
+       ${GLFW_LIBRARIES}
        ${FREETYPE_LIBRARIES}
 )
 
 target_include_directories(dragonblocks PUBLIC
+       ${GLEW_INCLUDE_DIRS}
+       ${GLFW_INCLUDE_DIRS}
        ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -144,10 +167,12 @@ add_executable(dragonblocks_server
        server/server.c
        server/server_config.c
        server/server_item.c
+       server/server_node.c
        server/server_player.c
        server/server_terrain.c
        server/terrain_gen.c
-       server/trees.c
+       server/tree.c
+       server/tree_physics.c
        server/voxel_depth_search.c
        server/voxel_procedural.c
 )
@@ -159,7 +184,7 @@ target_link_libraries(dragonblocks_server
 # Version
 
 add_custom_target(version
-       COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}  -P ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake
+       COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 )