From ddb51dfce37ba490791e55f8ab9c7e46a7cde167 Mon Sep 17 00:00:00 2001 From: Cloudwalk Date: Fri, 17 Sep 2021 10:34:43 -0400 Subject: [PATCH] cmake: Include OBJ_COMMON in OBJ_CL and _SV --- CMakeLists.txt | 4 ++-- buildsys/target/engine/client.cmake | 2 +- buildsys/target/engine/server.cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8a1cea4..a81a0e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,8 +274,8 @@ set(OBJ_HEADERS set(OBJ_SND_COMMON snd_main.c snd_mem.c snd_mix.c snd_ogg.c snd_wav.c) set(OBJ_VIDEO_CAPTURE cap_avi.c cap_ogg.c) set(OBJ_MENU menu.c mvm_cmds.c) -set(OBJ_SV builddate.c sys_unix.c vid_null.c snd_null.c thread_null.c) -set(OBJ_CL builddate.c snd_sdl.c sys_sdl.c vid_sdl.c thread_sdl.c) +set(OBJ_SV ${OBJ_COMMON} builddate.c sys_unix.c vid_null.c snd_null.c thread_null.c) +set(OBJ_CL ${OBJ_COMMON} builddate.c snd_sdl.c sys_sdl.c vid_sdl.c thread_sdl.c) set(OBJ_RC ${ENGINE_BUILD_WINRC}) # Make the headers show up in IDEs diff --git a/buildsys/target/engine/client.cmake b/buildsys/target/engine/client.cmake index e2d937f2..844bcdab 100644 --- a/buildsys/target/engine/client.cmake +++ b/buildsys/target/engine/client.cmake @@ -1,4 +1,4 @@ -add_executable(client ${OBJ_COMMON} ${OBJ_CL} ${OBJ_MENU} ${OBJ_SND_COMMON} ${OBJ_CD_COMMON} ${OBJ_VIDEO_CAPTURE}) +add_executable(client ${OBJ_CL} ${OBJ_MENU} ${OBJ_SND_COMMON} ${OBJ_CD_COMMON} ${OBJ_VIDEO_CAPTURE}) target_link_libraries(client common) set_target_properties(client PROPERTIES OUTPUT_NAME "${ENGINE_BUILD_NAME}") diff --git a/buildsys/target/engine/server.cmake b/buildsys/target/engine/server.cmake index 138bea19..ab6c1e56 100644 --- a/buildsys/target/engine/server.cmake +++ b/buildsys/target/engine/server.cmake @@ -1,4 +1,4 @@ -add_executable(server ${OBJ_COMMON} ${OBJ_SV}) +add_executable(server ${OBJ_SV}) target_link_libraries(server common) set_target_properties(server PROPERTIES OUTPUT_NAME ${ENGINE_BUILD_NAME}-dedicated) -- 2.39.2