edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMakeLists.txt: Make external dependencies to OBJ libs

Browse source
This commit is contained in:
heinrich5991 2017-03-01 18:29:11 +01:00
parent e3839e4bf2
commit 1c7be368f6
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -193,6 +193,10 @@ add_library(game-shared OBJECT ${GAME_SHARED} ${GAME_GENERATED_SHARED})
# CLIENT # CLIENT
######################################################################## ########################################################################
file(GLOB DEP_PNG_SRC "src/engine/external/pnglite/*.c" "src/engine/external/pnglite/*.h")
add_library(png OBJECT ${DEP_PNG_SRC})
set(DEP_PNG $<TARGET_OBJECTS:png>)
if(CLIENT) if(CLIENT)
# Sources # Sources
file(GLOB_RECURSE ENGINE_CLIENT "src/engine/client/*.cpp" "src/engine/client/*.h") file(GLOB_RECURSE ENGINE_CLIENT "src/engine/client/*.cpp" "src/engine/client/*.h")
@ -202,10 +206,13 @@ if(CLIENT)
set(CLIENT_SRC ${ENGINE_CLIENT} ${GAME_CLIENT} ${GAME_EDITOR} ${GAME_GENERATED_CLIENT}) set(CLIENT_SRC ${ENGINE_CLIENT} ${GAME_CLIENT} ${GAME_EDITOR} ${GAME_GENERATED_CLIENT})
# Static dependencies # Static dependencies
# TODO: Make add_library(.. OBJECT ..) out of these. file(GLOB DEP_JSON_SRC "src/engine/external/json-parser/*.c" "src/engine/external/json-parser/*.h")
file(GLOB DEP_JSON "src/engine/external/json-parser/*.c" "src/engine/external/json-parser/*.h") file(GLOB DEP_WAV_SRC "src/engine/external/wavpack/*.c" "src/engine/external/wavpack/*.h")
file(GLOB DEP_PNG "src/engine/external/pnglite/*.c" "src/engine/external/pnglite/*.h") add_library(json OBJECT ${DEP_JSON_SRC})
file(GLOB DEP_WAV "src/engine/external/wavpack/*.c" "src/engine/external/wavpack/*.h") add_library(wav OBJECT ${DEP_WAV_SRC})
set(DEP_JSON $<TARGET_OBJECTS:json>)
set(DEP_WAV $<TARGET_OBJECTS:wav>)
set(DEPS_CLIENT ${DEP_JSON} ${DEP_PNG} ${DEP_WAV}) set(DEPS_CLIENT ${DEP_JSON} ${DEP_PNG} ${DEP_WAV})
# Libraries # Libraries
@ -309,6 +316,7 @@ foreach(T ${TOOLS})
) )
if(TOOL MATCHES "^(tileset_|dilate$)") if(TOOL MATCHES "^(tileset_|dilate$)")
target_sources(${TOOL} PRIVATE ${DEP_PNG}) target_sources(${TOOL} PRIVATE ${DEP_PNG})
message(STATUS ${TOOL})
endif() endif()
if(TOOL MATCHES "^config_") if(TOOL MATCHES "^config_")
target_sources(${TOOL} PRIVATE "src/tools/config_common.h") target_sources(${TOOL} PRIVATE "src/tools/config_common.h")