cmake: Include OBJ_COMMON in OBJ_CL and _SV

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8a1cea4ae6fb371f7d09b43cf5da7b64270fa76..a81a0e93937c9c97ef006fd69435a68f5eb009f2 100644 (file)
--- 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 e2d937f2513750913158dc83395e4aa94a995005..844bcdab40be88f3a551adc20899f465c9b04860 100644 (file)
--- 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 138bea19bcfe9a708bcdfda8bd86dbeab2702261..ab6c1e56c7ac9d596e2a9b49e586430bea76cf99 100644 (file)
--- 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)