Rename ‘src/baseq2’ subdir to ‘src/game’.

res2k · Oct 6, 2023 · 27a47c5 · 27a47c5
1 parent e89d62e
commit 27a47c5
Show file tree

Hide file tree

Showing 76 changed files with 94 additions and 94 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,83 +4,83 @@ cmake_policy(SET CMP0069 NEW)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
-SET(SRC_BASEQ2
-	baseq2/g_ai.c
-	baseq2/g_chase.c
-	baseq2/g_cmds.c
-	baseq2/g_combat.c
-	baseq2/g_func.c
-	baseq2/g_items.c
-	baseq2/g_main.c
-	baseq2/g_misc.c
-	baseq2/g_monster.c
-	baseq2/g_phys.c
-	baseq2/g_ptrs.c
-	baseq2/g_ptrs_compat_v2.c
-	baseq2/g_save.c
-	baseq2/g_spawn.c
-	baseq2/g_svcmds.c
-	baseq2/g_target.c
-	baseq2/g_trigger.c
-	baseq2/g_turret.c
-	baseq2/g_utils.c
-	baseq2/g_weapon.c
-	baseq2/m_actor.c
-	baseq2/m_berserk.c
-	baseq2/m_boss2.c
-	baseq2/m_boss3.c
-	baseq2/m_boss31.c
-	baseq2/m_boss32.c
-	baseq2/m_brain.c
-	baseq2/m_chick.c
-	baseq2/m_flipper.c
-	baseq2/m_float.c
-	baseq2/m_flyer.c
-	baseq2/m_gladiator.c
-	baseq2/m_gunner.c
-	baseq2/m_hover.c
-	baseq2/m_infantry.c
-	baseq2/m_insane.c
-	baseq2/m_medic.c
-	baseq2/m_move.c
-	baseq2/m_mutant.c
-	baseq2/m_parasite.c
-	baseq2/m_soldier.c
-	baseq2/m_supertank.c
-	baseq2/m_tank.c
-	baseq2/p_client.c
-	baseq2/p_hud.c
-	baseq2/p_trail.c
-	baseq2/p_view.c
-	baseq2/p_weapon.c
+SET(SRC_GAME
+	game/g_ai.c
+	game/g_chase.c
+	game/g_cmds.c
+	game/g_combat.c
+	game/g_func.c
+	game/g_items.c
+	game/g_main.c
+	game/g_misc.c
+	game/g_monster.c
+	game/g_phys.c
+	game/g_ptrs.c
+	game/g_ptrs_compat_v2.c
+	game/g_save.c
+	game/g_spawn.c
+	game/g_svcmds.c
+	game/g_target.c
+	game/g_trigger.c
+	game/g_turret.c
+	game/g_utils.c
+	game/g_weapon.c
+	game/m_actor.c
+	game/m_berserk.c
+	game/m_boss2.c
+	game/m_boss3.c
+	game/m_boss31.c
+	game/m_boss32.c
+	game/m_brain.c
+	game/m_chick.c
+	game/m_flipper.c
+	game/m_float.c
+	game/m_flyer.c
+	game/m_gladiator.c
+	game/m_gunner.c
+	game/m_hover.c
+	game/m_infantry.c
+	game/m_insane.c
+	game/m_medic.c
+	game/m_move.c
+	game/m_mutant.c
+	game/m_parasite.c
+	game/m_soldier.c
+	game/m_supertank.c
+	game/m_tank.c
+	game/p_client.c
+	game/p_hud.c
+	game/p_trail.c
+	game/p_view.c
+	game/p_weapon.c
 )
 
-SET(HEADERS_BASEQ2
-	baseq2/g_local.h
-	baseq2/g_ptrs.h
-	baseq2/m_actor.h
-	baseq2/m_berserk.h
-	baseq2/m_boss2.h
-	baseq2/m_boss31.h
-	baseq2/m_boss32.h
-	baseq2/m_brain.h
-	baseq2/m_chick.h
-	baseq2/m_flipper.h
-	baseq2/m_float.h
-	baseq2/m_flyer.h
-	baseq2/m_gladiator.h
-	baseq2/m_gunner.h
-	baseq2/m_hover.h
-	baseq2/m_infantry.h
-	baseq2/m_insane.h
-	baseq2/m_medic.h
-	baseq2/m_mutant.h
-	baseq2/m_parasite.h
-	baseq2/m_player.h
-	baseq2/m_rider.h
-	baseq2/m_soldier.h
-	baseq2/m_supertank.h
-	baseq2/m_tank.h
+SET(HEADERS_GAME
+	game/g_local.h
+	game/g_ptrs.h
+	game/m_actor.h
+	game/m_berserk.h
+	game/m_boss2.h
+	game/m_boss31.h
+	game/m_boss32.h
+	game/m_brain.h
+	game/m_chick.h
+	game/m_flipper.h
+	game/m_float.h
+	game/m_flyer.h
+	game/m_gladiator.h
+	game/m_gunner.h
+	game/m_hover.h
+	game/m_infantry.h
+	game/m_insane.h
+	game/m_medic.h
+	game/m_mutant.h
+	game/m_parasite.h
+	game/m_player.h
+	game/m_rider.h
+	game/m_soldier.h
+	game/m_supertank.h
+	game/m_tank.h
 )
 
 
@@ -423,10 +423,10 @@ if(NOT MSVC)
     # CCompilerFlagString(WARN_MISSING_PROTOTYPES "-Wmissing-prototypes")
 endif()
 
-ADD_LIBRARY(baseq2 SHARED ${SRC_BASEQ2} ${HEADERS_BASEQ2} ${SRC_SHARED})
+ADD_LIBRARY(game SHARED ${SRC_GAME} ${HEADERS_GAME} ${SRC_SHARED})
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     # Workaround for GCC 10 linking shared libgcc by default
-    target_link_options(baseq2 PRIVATE "-static-libgcc")
+    target_link_options(game PRIVATE "-static-libgcc")
 endif()
 
 IF(WIN32)
@@ -514,8 +514,8 @@ IF (TARGET client)
 	TARGET_LINK_LIBRARIES(client OpenAL)
 ENDIF()
 
-SOURCE_GROUP("baseq2\\sources" FILES ${SRC_BASEQ2})
-SOURCE_GROUP("baseq2\\headers" FILES ${HEADERS_BASEQ2})
+SOURCE_GROUP("game\\sources" FILES ${SRC_GAME})
+SOURCE_GROUP("game\\headers" FILES ${HEADERS_GAME})
 SOURCE_GROUP("client\\sources" FILES ${SRC_CLIENT})
 SOURCE_GROUP("client\\headers" FILES ${HEADERS_CLIENT})
 SOURCE_GROUP("server\\sources" FILES ${SRC_SERVER})
@@ -539,19 +539,19 @@ IF (WIN32)
     ENDIF()
 
     TARGET_INCLUDE_DIRECTORIES(server PRIVATE ../VC/inc)
-    TARGET_INCLUDE_DIRECTORIES(baseq2 PRIVATE ../VC/inc)
-    TARGET_SOURCES(baseq2 PRIVATE windows/res/baseq2.rc)
+    TARGET_INCLUDE_DIRECTORIES(game PRIVATE ../VC/inc)
+    TARGET_SOURCES(game PRIVATE windows/res/game.rc)
 
     TARGET_LINK_LIBRARIES(server winmm ws2_32)
 
     SET_TARGET_PROPERTIES(server PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 
     # macro redefinition, deprecation
     TARGET_COMPILE_OPTIONS(server PRIVATE /wd4005 /wd4996)
-    TARGET_COMPILE_OPTIONS(baseq2 PRIVATE /wd4005 /wd4996)
+    TARGET_COMPILE_OPTIONS(game PRIVATE /wd4005 /wd4996)
 ENDIF()
 
-TARGET_INCLUDE_DIRECTORIES(baseq2 PRIVATE ../inc)
+TARGET_INCLUDE_DIRECTORIES(game PRIVATE ../inc)
 
 IF(TARGET client)
     TARGET_INCLUDE_DIRECTORIES(client PRIVATE ../inc)
@@ -567,13 +567,13 @@ if (CONFIG_LINUX_STEAM_RUNTIME_SUPPORT)
         TARGET_LINK_LIBRARIES(client SDL2main SDL2-static z)
     ENDIF()
     TARGET_LINK_LIBRARIES(server z)
-    TARGET_LINK_LIBRARIES(baseq2 z)
+    TARGET_LINK_LIBRARIES(game z)
 else()
     IF(TARGET client)
         TARGET_LINK_LIBRARIES(client SDL2main SDL2-static zlibstatic)
     ENDIF()
     TARGET_LINK_LIBRARIES(server zlibstatic)
-    TARGET_LINK_LIBRARIES(baseq2 zlibstatic)
+    TARGET_LINK_LIBRARIES(game zlibstatic)
 endif()
 
 IF(UNIX)
@@ -611,7 +611,7 @@ ENDIF()
 
 # specify both LIBRARY and RUNTIME because one works only on Windows and another works only on Linux
 
-SET_TARGET_PROPERTIES(baseq2
+SET_TARGET_PROPERTIES(game
     PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/baseq2"
     LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/baseq2"
@@ -629,26 +629,26 @@ SET_TARGET_PROPERTIES(baseq2
 
 IF(IS_64_BIT)
 	IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-		SET_TARGET_PROPERTIES(baseq2
+		SET_TARGET_PROPERTIES(game
 			PROPERTIES
 			LIBRARY_OUTPUT_NAME "gameaarch64"
 			RUNTIME_OUTPUT_NAME "gameaarch64"
 		)
 	ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
-		SET_TARGET_PROPERTIES(baseq2
+		SET_TARGET_PROPERTIES(game
 			PROPERTIES
 			LIBRARY_OUTPUT_NAME "gameppc64le"
 			RUNTIME_OUTPUT_NAME "gameppc64le"
                 )
 	ELSE()
-		SET_TARGET_PROPERTIES(baseq2
+		SET_TARGET_PROPERTIES(game
 			PROPERTIES
 			LIBRARY_OUTPUT_NAME "gamex86_64"
 			RUNTIME_OUTPUT_NAME "gamex86_64"
 		)
 	ENDIF()
 ELSE()
-    SET_TARGET_PROPERTIES(baseq2
+    SET_TARGET_PROPERTIES(game
         PROPERTIES
         LIBRARY_OUTPUT_NAME "gamex86"
         RUNTIME_OUTPUT_NAME "gamex86"
@@ -669,7 +669,7 @@ IF(CONFIG_LINUX_PACKAGING_SUPPORT)
 	        SCRIPT "${CMAKE_SOURCE_DIR}/setup/package_shaders.cmake"
 	        COMPONENT shareware)
 	ENDIF()
-    INSTALL(TARGETS baseq2 DESTINATION share/quake2rtx/baseq2 COMPONENT shareware)
+    INSTALL(TARGETS game DESTINATION share/quake2rtx/baseq2 COMPONENT shareware)
 
     # Package data files, including the shareware pak0 for demo levels
     set (SHAREWARE_DATA_FILES_LIST

diff --git a/src/baseq2/g_ai.c → src/game/g_ai.c b/src/baseq2/g_ai.c → src/game/g_ai.c
diff --git a/src/baseq2/g_chase.c → src/game/g_chase.c b/src/baseq2/g_chase.c → src/game/g_chase.c
diff --git a/src/baseq2/g_cmds.c → src/game/g_cmds.c b/src/baseq2/g_cmds.c → src/game/g_cmds.c
diff --git a/src/baseq2/g_combat.c → src/game/g_combat.c b/src/baseq2/g_combat.c → src/game/g_combat.c
diff --git a/src/baseq2/g_func.c → src/game/g_func.c b/src/baseq2/g_func.c → src/game/g_func.c
diff --git a/src/baseq2/g_items.c → src/game/g_items.c b/src/baseq2/g_items.c → src/game/g_items.c
diff --git a/src/baseq2/g_local.h → src/game/g_local.h b/src/baseq2/g_local.h → src/game/g_local.h
diff --git a/src/baseq2/g_main.c → src/game/g_main.c b/src/baseq2/g_main.c → src/game/g_main.c
diff --git a/src/baseq2/g_misc.c → src/game/g_misc.c b/src/baseq2/g_misc.c → src/game/g_misc.c
diff --git a/src/baseq2/g_monster.c → src/game/g_monster.c b/src/baseq2/g_monster.c → src/game/g_monster.c
diff --git a/src/baseq2/g_phys.c → src/game/g_phys.c b/src/baseq2/g_phys.c → src/game/g_phys.c
diff --git a/src/baseq2/g_ptrs.c → src/game/g_ptrs.c b/src/baseq2/g_ptrs.c → src/game/g_ptrs.c
diff --git a/src/baseq2/g_ptrs.h → src/game/g_ptrs.h b/src/baseq2/g_ptrs.h → src/game/g_ptrs.h
diff --git a/src/baseq2/g_ptrs_compat_v2.c → src/game/g_ptrs_compat_v2.c b/src/baseq2/g_ptrs_compat_v2.c → src/game/g_ptrs_compat_v2.c
diff --git a/src/baseq2/g_save.c → src/game/g_save.c b/src/baseq2/g_save.c → src/game/g_save.c
diff --git a/src/baseq2/g_spawn.c → src/game/g_spawn.c b/src/baseq2/g_spawn.c → src/game/g_spawn.c
diff --git a/src/baseq2/g_svcmds.c → src/game/g_svcmds.c b/src/baseq2/g_svcmds.c → src/game/g_svcmds.c
diff --git a/src/baseq2/g_target.c → src/game/g_target.c b/src/baseq2/g_target.c → src/game/g_target.c
diff --git a/src/baseq2/g_trigger.c → src/game/g_trigger.c b/src/baseq2/g_trigger.c → src/game/g_trigger.c
diff --git a/src/baseq2/g_turret.c → src/game/g_turret.c b/src/baseq2/g_turret.c → src/game/g_turret.c
diff --git a/src/baseq2/g_utils.c → src/game/g_utils.c b/src/baseq2/g_utils.c → src/game/g_utils.c
diff --git a/src/baseq2/g_weapon.c → src/game/g_weapon.c b/src/baseq2/g_weapon.c → src/game/g_weapon.c
diff --git a/src/baseq2/genptr.py → src/game/genptr.py b/src/baseq2/genptr.py → src/game/genptr.py
diff --git a/src/baseq2/m_actor.c → src/game/m_actor.c b/src/baseq2/m_actor.c → src/game/m_actor.c
diff --git a/src/baseq2/m_actor.h → src/game/m_actor.h b/src/baseq2/m_actor.h → src/game/m_actor.h
diff --git a/src/baseq2/m_berserk.c → src/game/m_berserk.c b/src/baseq2/m_berserk.c → src/game/m_berserk.c
diff --git a/src/baseq2/m_berserk.h → src/game/m_berserk.h b/src/baseq2/m_berserk.h → src/game/m_berserk.h
diff --git a/src/baseq2/m_boss2.c → src/game/m_boss2.c b/src/baseq2/m_boss2.c → src/game/m_boss2.c
diff --git a/src/baseq2/m_boss2.h → src/game/m_boss2.h b/src/baseq2/m_boss2.h → src/game/m_boss2.h
diff --git a/src/baseq2/m_boss3.c → src/game/m_boss3.c b/src/baseq2/m_boss3.c → src/game/m_boss3.c
diff --git a/src/baseq2/m_boss31.c → src/game/m_boss31.c b/src/baseq2/m_boss31.c → src/game/m_boss31.c
diff --git a/src/baseq2/m_boss31.h → src/game/m_boss31.h b/src/baseq2/m_boss31.h → src/game/m_boss31.h
diff --git a/src/baseq2/m_boss32.c → src/game/m_boss32.c b/src/baseq2/m_boss32.c → src/game/m_boss32.c
diff --git a/src/baseq2/m_boss32.h → src/game/m_boss32.h b/src/baseq2/m_boss32.h → src/game/m_boss32.h
diff --git a/src/baseq2/m_brain.c → src/game/m_brain.c b/src/baseq2/m_brain.c → src/game/m_brain.c
diff --git a/src/baseq2/m_brain.h → src/game/m_brain.h b/src/baseq2/m_brain.h → src/game/m_brain.h
diff --git a/src/baseq2/m_chick.c → src/game/m_chick.c b/src/baseq2/m_chick.c → src/game/m_chick.c
diff --git a/src/baseq2/m_chick.h → src/game/m_chick.h b/src/baseq2/m_chick.h → src/game/m_chick.h
diff --git a/src/baseq2/m_flipper.c → src/game/m_flipper.c b/src/baseq2/m_flipper.c → src/game/m_flipper.c
diff --git a/src/baseq2/m_flipper.h → src/game/m_flipper.h b/src/baseq2/m_flipper.h → src/game/m_flipper.h
diff --git a/src/baseq2/m_float.c → src/game/m_float.c b/src/baseq2/m_float.c → src/game/m_float.c
diff --git a/src/baseq2/m_float.h → src/game/m_float.h b/src/baseq2/m_float.h → src/game/m_float.h
diff --git a/src/baseq2/m_flyer.c → src/game/m_flyer.c b/src/baseq2/m_flyer.c → src/game/m_flyer.c
diff --git a/src/baseq2/m_flyer.h → src/game/m_flyer.h b/src/baseq2/m_flyer.h → src/game/m_flyer.h
diff --git a/src/baseq2/m_gladiator.c → src/game/m_gladiator.c b/src/baseq2/m_gladiator.c → src/game/m_gladiator.c
diff --git a/src/baseq2/m_gladiator.h → src/game/m_gladiator.h b/src/baseq2/m_gladiator.h → src/game/m_gladiator.h
diff --git a/src/baseq2/m_gunner.c → src/game/m_gunner.c b/src/baseq2/m_gunner.c → src/game/m_gunner.c
diff --git a/src/baseq2/m_gunner.h → src/game/m_gunner.h b/src/baseq2/m_gunner.h → src/game/m_gunner.h
diff --git a/src/baseq2/m_hover.c → src/game/m_hover.c b/src/baseq2/m_hover.c → src/game/m_hover.c
diff --git a/src/baseq2/m_hover.h → src/game/m_hover.h b/src/baseq2/m_hover.h → src/game/m_hover.h
diff --git a/src/baseq2/m_infantry.c → src/game/m_infantry.c b/src/baseq2/m_infantry.c → src/game/m_infantry.c
diff --git a/src/baseq2/m_infantry.h → src/game/m_infantry.h b/src/baseq2/m_infantry.h → src/game/m_infantry.h
diff --git a/src/baseq2/m_insane.c → src/game/m_insane.c b/src/baseq2/m_insane.c → src/game/m_insane.c
diff --git a/src/baseq2/m_insane.h → src/game/m_insane.h b/src/baseq2/m_insane.h → src/game/m_insane.h
diff --git a/src/baseq2/m_medic.c → src/game/m_medic.c b/src/baseq2/m_medic.c → src/game/m_medic.c
diff --git a/src/baseq2/m_medic.h → src/game/m_medic.h b/src/baseq2/m_medic.h → src/game/m_medic.h
diff --git a/src/baseq2/m_move.c → src/game/m_move.c b/src/baseq2/m_move.c → src/game/m_move.c
diff --git a/src/baseq2/m_mutant.c → src/game/m_mutant.c b/src/baseq2/m_mutant.c → src/game/m_mutant.c
diff --git a/src/baseq2/m_mutant.h → src/game/m_mutant.h b/src/baseq2/m_mutant.h → src/game/m_mutant.h
diff --git a/src/baseq2/m_parasite.c → src/game/m_parasite.c b/src/baseq2/m_parasite.c → src/game/m_parasite.c
diff --git a/src/baseq2/m_parasite.h → src/game/m_parasite.h b/src/baseq2/m_parasite.h → src/game/m_parasite.h
diff --git a/src/baseq2/m_player.h → src/game/m_player.h b/src/baseq2/m_player.h → src/game/m_player.h
diff --git a/src/baseq2/m_rider.h → src/game/m_rider.h b/src/baseq2/m_rider.h → src/game/m_rider.h
diff --git a/src/baseq2/m_soldier.c → src/game/m_soldier.c b/src/baseq2/m_soldier.c → src/game/m_soldier.c
diff --git a/src/baseq2/m_soldier.h → src/game/m_soldier.h b/src/baseq2/m_soldier.h → src/game/m_soldier.h
diff --git a/src/baseq2/m_supertank.c → src/game/m_supertank.c b/src/baseq2/m_supertank.c → src/game/m_supertank.c
diff --git a/src/baseq2/m_supertank.h → src/game/m_supertank.h b/src/baseq2/m_supertank.h → src/game/m_supertank.h
diff --git a/src/baseq2/m_tank.c → src/game/m_tank.c b/src/baseq2/m_tank.c → src/game/m_tank.c
diff --git a/src/baseq2/m_tank.h → src/game/m_tank.h b/src/baseq2/m_tank.h → src/game/m_tank.h
diff --git a/src/baseq2/p_client.c → src/game/p_client.c b/src/baseq2/p_client.c → src/game/p_client.c
diff --git a/src/baseq2/p_hud.c → src/game/p_hud.c b/src/baseq2/p_hud.c → src/game/p_hud.c
diff --git a/src/baseq2/p_trail.c → src/game/p_trail.c b/src/baseq2/p_trail.c → src/game/p_trail.c
diff --git a/src/baseq2/p_view.c → src/game/p_view.c b/src/baseq2/p_view.c → src/game/p_view.c
diff --git a/src/baseq2/p_weapon.c → src/game/p_weapon.c b/src/baseq2/p_weapon.c → src/game/p_weapon.c
diff --git a/src/windows/res/baseq2.rc → src/windows/res/game.rc b/src/windows/res/baseq2.rc → src/windows/res/game.rc
@@ -12,7 +12,7 @@
 #define VER_FILEFLAGS   0x0L
 #endif
 
-#define VER_FILEDESCRIPTION_STR     "Q2RTX baseq2 Game Module " LONG_VERSION_STRING
+#define VER_FILEDESCRIPTION_STR     "Q2RTX game Module " LONG_VERSION_STRING
 #define VER_ORIGINALFILENAME_STR    "gamex86_64.dll"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -34,8 +34,8 @@ BEGIN
             VALUE "FileDescription", VER_FILEDESCRIPTION_STR
             VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
             VALUE "FileVersion", VERSION_STRING
-            VALUE "InternalName", "baseq2"
-            VALUE "LegalCopyright", "Copyright (C) 2019-2020, NVIDIA CORPORATION. All rights reserved."
+            VALUE "InternalName", "game"
+            VALUE "LegalCopyright", "Copyright (C) 2019-2023, NVIDIA CORPORATION. All rights reserved."
             VALUE "ProductName", "Quake II RTX"
             VALUE "ProductVersion", VERSION_STRING
         END