[GEN][ZH] Remove "pragma comment" implict linker instructions. (#498)

OmniBlade · OmniBlade · commit 6225457a8742 · 2025-03-26T15:37:59.000Z
Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1059,10 +1059,6 @@ set(GAMEENGINE_SRC
 
 add_library(g_gameengine STATIC)
 
-set_target_properties(g_gameengine PROPERTIES OUTPUT_NAME
-    $<IF:$<CONFIG:Debug>,gameenginedebug,$<IF:$<BOOL:${GENZH_BUILD_INTERNAL}>,gameengineinternal,gameengine>>
-)
-
 target_sources(g_gameengine PRIVATE ${GAMEENGINE_SRC})
 
 target_include_directories(g_gameengine PUBLIC
diff --git a/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp b/Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp
@@ -3242,23 +3242,6 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 // GLOBAL FUNCTIONS
 //-----------------------------------------------------------------------------
 
-/*
-	This is a trick that is intended to force MSVC to link this file (and thus,
-	these definitions of new/delete) ahead of all others. (We do debug checking
-	to ensure that's the case)
-*/
-#if defined(_DEBUG)
-	#pragma comment(lib, "GameEngineDebug")
-#elif defined(_INTERNAL)
-	#pragma comment(lib, "GameEngineInternal")
-#else
-	#pragma comment(lib, "GameEngine")
-#endif
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	#pragma comment(linker, "/force:multiple")
-#endif
-
 static int theLinkTester = 0;
 
 //-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp b/Generals/Code/GameEngine/Source/Common/System/StackDump.cpp
@@ -28,8 +28,6 @@
 
 #pragma pack(push, 8)
 
-#pragma comment(linker, "/defaultlib:Dbghelp.lib")
-
 #include "Common/StackDump.h"
 #include "Common/Debug.h"
 
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGranny.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGranny.cpp
@@ -54,8 +54,6 @@
 #include "WW3D2/dx8wrapper.h"
 #include "WW3D2/scene.h"
 
-#pragma comment( lib, "granny2" )
-
 static granny_pnt332_vertex g_blendingBuffer[4096];	///<temporary workspace for granny (all models < 4096 verts).
 
 /** Local function used to find animation matching the given model */
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
@@ -9,6 +9,7 @@ endif()
 
 target_link_libraries(g_generals PRIVATE
     binkstub
+    comctl32
     d3d8
     d3dx8
     dbghelplib
diff --git a/Generals/Code/Tools/MapCacheBuilder/CMakeLists.txt b/Generals/Code/Tools/MapCacheBuilder/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(g_mapcachebuilder PRIVATE
 )
 #
 target_link_libraries(g_mapcachebuilder PRIVATE
+    comctl32
     dbghelplib
     g_gameengine
     g_gameenginedevice
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -1142,10 +1142,6 @@ set(GAMEENGINE_SRC
 
 add_library(z_gameengine STATIC)
 
-set_target_properties(z_gameengine PROPERTIES OUTPUT_NAME
-    $<IF:$<CONFIG:Debug>,gameenginedebug,$<IF:$<BOOL:${GENZH_BUILD_INTERNAL}>,gameengineinternal,gameengine>>
-)
-
 target_sources(z_gameengine PRIVATE ${GAMEENGINE_SRC})
 
 target_include_directories(z_gameengine PUBLIC
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/GameMemory.cpp
@@ -3230,23 +3230,6 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 // GLOBAL FUNCTIONS
 //-----------------------------------------------------------------------------
 
-/*
-	This is a trick that is intended to force MSVC to link this file (and thus,
-	these definitions of new/delete) ahead of all others. (We do debug checking
-	to ensure that's the case)
-*/
-#if defined(_DEBUG)
-	#pragma comment(lib, "GameEngineDebug")
-#elif defined(_INTERNAL)
-	#pragma comment(lib, "GameEngineInternal")
-#else
-	#pragma comment(lib, "GameEngine")
-#endif
-
-#ifdef MEMORYPOOL_OVERRIDE_MALLOC
-	#pragma comment(linker, "/force:multiple")
-#endif
-
 static int theLinkTester = 0;
 
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp
@@ -28,8 +28,6 @@
 
 #pragma pack(push, 8)
 
-#pragma comment(linker, "/defaultlib:Dbghelp.lib")
-
 #include "Common/StackDump.h"
 #include "Common/Debug.h"
 
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -197,7 +197,6 @@ set(GAMEENGINEDEVICE_SRC
 )
 
 add_library(z_gameenginedevice STATIC)
-set_target_properties(z_gameenginedevice PROPERTIES OUTPUT_NAME gameenginedevice)
 
 target_sources(z_gameenginedevice PRIVATE ${GAMEENGINEDEVICE_SRC})
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGranny.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DGranny.cpp
@@ -54,8 +54,6 @@
 #include "WW3D2/dx8wrapper.h"
 #include "WW3D2/scene.h"
 
-#pragma comment( lib, "granny2" )
-
 static granny_pnt332_vertex g_blendingBuffer[4096];	///<temporary workspace for granny (all models < 4096 verts).
 
 /** Local function used to find animation matching the given model */
diff --git a/GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt
@@ -25,8 +25,6 @@ set(DEBUG_SRC
 )
 
 add_library(z_debug STATIC)
-# pragma comment statements force linking certain libraries require this monster of a generator statement.
-set_target_properties(z_debug PROPERTIES OUTPUT_NAME $<IF:$<CONFIG:Debug>,debugdebug,$<IF:$<BOOL:${GENZH_BUILD_INTERNAL}>,debuginternal,$<IF:$<BOOL:${GENZH_BUILD_PROFILE}>,debugprofile,debug>>>)
 
 target_sources(z_debug PRIVATE ${DEBUG_SRC})
 
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug.h b/GeneralsMD/Code/Libraries/Source/debug/debug.h
@@ -90,22 +90,18 @@
 
 // Define which libraries to use. 
 #if defined(_INTERNAL)
-#  pragma comment (lib,"debuginternal.lib")
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #  define HAS_OPT
 #elif defined(_DEBUG)
-#  pragma comment (lib,"debugdebug.lib")
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #elif defined(_PROFILE)
-#  pragma comment (lib,"debugprofile.lib")
 #  define HAS_ASSERTS
 #  define HAS_LOGS
 #  define HAS_OPT
 #  define HAS_PROFILE
 #else
-#  pragma comment (lib,"debug.lib")
 #  define HAS_OPT
 #endif
 
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug_debug.h b/GeneralsMD/Code/Libraries/Source/debug/debug_debug.h
@@ -32,10 +32,6 @@
 #ifndef DEBUG_DEBUG_H // Include guard
 #define DEBUG_DEBUG_H
 
-// this makes sure that whenever this header is included
-// the accompanying OBJ file is linked in as well
-#pragma comment(linker,"/include:___DebugIncludeInLink1")
-
 /**
   \class Debug debug.h <rts/debug.h>
   
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.cpp b/GeneralsMD/Code/Libraries/Source/debug/debug_dlg/debug_dlg.cpp
@@ -34,8 +34,6 @@
 
 // Pardon my coding here but this is for testing only...
 
-#pragma comment (lib,"comctl32")
-
 BOOL CALLBACK DialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   switch(uMsg)
diff --git a/GeneralsMD/Code/Libraries/Source/debug/debug_except.cpp b/GeneralsMD/Code/Libraries/Source/debug/debug_except.cpp
@@ -29,8 +29,6 @@
 #include "_pch.h"
 #include <commctrl.h>
 
-#pragma comment (lib,"comctl32")
-
 DebugExceptionhandler::DebugExceptionhandler(void)
 {
   // don't do anything here!
diff --git a/GeneralsMD/Code/Libraries/Source/debug/test3/test3.cpp b/GeneralsMD/Code/Libraries/Source/debug/test3/test3.cpp
@@ -27,9 +27,6 @@
 // Debug module - Test 3 (Checking FLAT I/O, logging)
 //////////////////////////////////////////////////////////////////////////////
 #ifdef NDEBUG
-#  define _INTERNAL
-#  pragma comment(linker,"/nodefaultlib:debuginternal.lib")
-#endif
 #include "../debug.h"
 
 unsigned divByNull;
diff --git a/GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt
@@ -19,7 +19,6 @@ set(PROFILE_SRC
 )
 
 add_library(z_profile STATIC)
-set_target_properties(z_profile PROPERTIES OUTPUT_NAME $<IF:$<CONFIG:Debug>,profiledebug,$<IF:$<BOOL:${GENZH_BUILD_INTERNAL}>,profileinternal,$<IF:$<BOOL:${GENZH_BUILD_PROFILE}>,profileprofile,profile>>>)
 
 target_sources(z_profile PRIVATE ${PROFILE_SRC})
 
diff --git a/GeneralsMD/Code/Libraries/Source/profile/profile.cpp b/GeneralsMD/Code/Libraries/Source/profile/profile.cpp
@@ -30,8 +30,6 @@
 #include <new>
 #include "mmsystem.h"
 
-#pragma comment (lib,"winmm")
-
 // yuk, I'm doing this so weird because the destructor
 // of cmd must never be called...
 static ProfileCmdInterface &cmd=*(ProfileCmdInterface *)new 
diff --git a/GeneralsMD/Code/Libraries/Source/profile/profile.h b/GeneralsMD/Code/Libraries/Source/profile/profile.h
@@ -36,17 +36,6 @@
 	#error "Only either _DEBUG or _INTERNAL should ever be defined"
 #endif
 
-// Define which libraries to use. 
-#if defined(_INTERNAL)
-#  pragma comment (lib,"profileinternal.lib")
-#elif defined(_DEBUG)
-#  pragma comment (lib,"profiledebug.lib")
-#elif defined(_PROFILE)
-#  pragma comment (lib,"profileprofile.lib")
-#else
-#  pragma comment (lib,"profile.lib")
-#endif
-
 // include all our public header files (use double quotes here)
 #include "profile_doc.h"
 #include "profile_highlevel.h"
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -9,6 +9,7 @@ endif()
 
 target_link_libraries(z_generals PRIVATE
     binkstub
+    comctl32
     d3d8
     d3dx8
     dbghelplib
diff --git a/GeneralsMD/Code/Tools/MapCacheBuilder/CMakeLists.txt b/GeneralsMD/Code/Tools/MapCacheBuilder/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(z_mapcachebuilder PRIVATE
 )
 #
 target_link_libraries(z_mapcachebuilder PRIVATE
+    comctl32
     dbghelplib
     imm32
     vfw32

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ target_include_directories(g_mapcachebuilder PRIVATE`
`15`	`15`	`)`
`16`	`16`	`#`
`17`	`17`	`target_link_libraries(g_mapcachebuilder PRIVATE`
	`18`	`+ comctl32`
`18`	`19`	`dbghelplib`
`19`	`20`	`g_gameengine`
`20`	`21`	`g_gameenginedevice`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,6 @@ set(GAMEENGINEDEVICE_SRC`
`197`	`197`	`)`
`198`	`198`
`199`	`199`	`add_library(z_gameenginedevice STATIC)`
`200`		`-set_target_properties(z_gameenginedevice PROPERTIES OUTPUT_NAME gameenginedevice)`
`201`	`200`
`202`	`201`	`target_sources(z_gameenginedevice PRIVATE ${GAMEENGINEDEVICE_SRC})`
`203`	`202`