Move shared source list to DaemonGame.cmake

DaemonEngine · Jan 30, 2025 · 1752e76 · 1752e76
1 parent 705b497
commit 1752e76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/cmake/DaemonGame.cmake b/cmake/DaemonGame.cmake
@@ -47,6 +47,22 @@ if (BUILD_GAME_NATIVE_DLL OR BUILD_GAME_NATIVE_EXE OR NACL)
     include(DaemonFlags)
 endif()
 
+# Source lists for src/shared
+set(SHAREDLIST
+    ${MOUNT_DIR}/shared/CommandBufferClient.cpp
+    ${MOUNT_DIR}/shared/CommandBufferClient.h
+    ${MOUNT_DIR}/shared/CommonProxies.cpp
+    ${MOUNT_DIR}/shared/CommonProxies.h
+    ${MOUNT_DIR}/shared/VMMain.cpp
+    ${MOUNT_DIR}/shared/VMMain.h
+)
+set(SHAREDLIST_cgame
+    ${MOUNT_DIR}/shared/client/cg_api.cpp ${MOUNT_DIR}/shared/client/cg_api.h
+)
+set(SHAREDLIST_sgame
+    ${MOUNT_DIR}/shared/server/sg_api.cpp ${MOUNT_DIR}/shared/server/sg_api.h
+)
+
 # Function to setup all the Sgame/Cgame libraries
 include(CMakeParseArguments)
 

diff --git a/src.cmake b/src.cmake
@@ -2,28 +2,6 @@ if (USE_MUMBLE)
     add_definitions("-DUSE_MUMBLE")
 endif()
 
-if (DAEMON_PARENT_SCOPE_DIR)
-    set(SHAREDLIST
-        ${MOUNT_DIR}/shared/CommandBufferClient.cpp
-        ${MOUNT_DIR}/shared/CommandBufferClient.h
-        ${MOUNT_DIR}/shared/CommonProxies.cpp
-        ${MOUNT_DIR}/shared/CommonProxies.h
-        ${MOUNT_DIR}/shared/VMMain.cpp
-        ${MOUNT_DIR}/shared/VMMain.h
-        PARENT_SCOPE
-    )
-
-    set(SHAREDLIST_cgame
-        ${MOUNT_DIR}/shared/client/cg_api.cpp ${MOUNT_DIR}/shared/client/cg_api.h
-        PARENT_SCOPE
-    )
-
-    set(SHAREDLIST_sgame
-        ${MOUNT_DIR}/shared/server/sg_api.cpp ${MOUNT_DIR}/shared/server/sg_api.h
-        PARENT_SCOPE
-    )
-endif()
-
 set(COMMONLIST
     ${COMMON_DIR}/Assert.h
     ${COMMON_DIR}/Color.h