Fix building debug and internal builds. (#452)

Author: OmniBlade

Generals/Code/GameEngine/CMakeLists.txt

@@ -1059,13 +1059,9 @@ set(GAMEENGINE_SRC
 
 add_library(g_gameengine STATIC)
 
-if(GENZH_BUILD_DEBUG)
-    set_target_properties(g_gameengine PROPERTIES OUTPUT_NAME gameenginedebug)
-elseif(GENZH_BUILD_INTERNAL)
-    set_target_properties(g_gameengine PROPERTIES OUTPUT_NAME gameengineinternal)
-else()
-    set_target_properties(g_gameengine PROPERTIES OUTPUT_NAME gameengine)
-endif()
+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})
 

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -1141,15 +1141,10 @@ set(GAMEENGINE_SRC
 )
 
 add_library(z_gameengine STATIC)
-set_target_properties(z_gameengine PROPERTIES OUTPUT_NAME $<IF:$<CONFIG:Debug>,gameenginedebug,gameengine>)
 
-if(GENZH_BUILD_DEBUG)
-    set_target_properties(z_gameengine PROPERTIES OUTPUT_NAME gameenginedebug)
-elseif(GENZH_BUILD_INTERNAL)
-    set_target_properties(z_gameengine PROPERTIES OUTPUT_NAME gameengineinternal)
-else()
-    set_target_properties(z_gameengine PROPERTIES OUTPUT_NAME gameengine)
-endif()
+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})
 

GeneralsMD/Code/Libraries/CMakeLists.txt

@@ -4,5 +4,8 @@ add_subdirectory(Source/WWVegas)
 # profiling library
 add_subdirectory(Source/profile)
 
+# debugging library
+add_subdirectory(Source/debug)
+
 add_subdirectory(Source/EABrowserDispatch)
 add_subdirectory(Source/Compression)

GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt

@@ -0,0 +1,40 @@
+set(DEBUG_SRC
+    "_pch.cpp"
+    "_pch.h"
+    "debug_io.h"
+    "debug_io_con.cpp"
+    "debug_io_flat.cpp"
+    "debug_io_net.cpp"
+    "debug_io_ods.cpp"
+    "internal_io.h"
+    "debug_except.cpp"
+    "internal_except.h"
+    "debug_stack.cpp"
+    "debug_stack.h"
+    "debug_cmd.cpp"
+    "debug_cmd.h"
+    "debug_getdefaultcommands.cpp"
+    "debug.cpp"
+    "debug.h"
+    "debug_debug.cpp"
+    "debug_debug.h"
+    "debug_doc.h"
+    "debug_internal.cpp"
+    "debug_macro.h"
+    "internal.h"
+)
+
+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})
+
+target_include_directories(z_debug INTERFACE
+    .
+)
+
+target_link_libraries(z_debug PRIVATE
+    gz_config
+    zi_libraries_include
+)

GeneralsMD/Code/Libraries/Source/debug/debug_stack.cpp

@@ -22,12 +22,12 @@
 // $Revision: #2 $
 // $DateTime: 2005/01/19 15:02:33 $
 //
-// ©2003 Electronic Arts
+// �2003 Electronic Arts
 //
 // Stack walker
 //////////////////////////////////////////////////////////////////////////////
 #include "_pch.h"
-#include "dbghelp.h"
+#include <imagehlp.h>
 
 // Definitions to allow run-time linking to the dbghelp.dll functions.
 

GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt

@@ -19,7 +19,7 @@ set(PROFILE_SRC
 )
 
 add_library(z_profile STATIC)
-set_target_properties(z_profile PROPERTIES OUTPUT_NAME profile)
+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})
 
@@ -28,13 +28,6 @@ target_include_directories(z_profile INTERFACE
 )
 
 target_link_libraries(z_profile PRIVATE
+    gz_config
     zi_libraries_include
 )
-
-if(GENZH_BUILD_DEBUG)
-    set_target_properties(z_profile PROPERTIES OUTPUT_NAME profiledebug)
-elseif(GENZH_BUILD_INTERNAL)
-    set_target_properties(z_profile PROPERTIES OUTPUT_NAME profileinternal)
-else()
-    set_target_properties(z_profile PROPERTIES OUTPUT_NAME profile)
-endif()

GeneralsMD/Code/Main/CMakeLists.txt

@@ -13,6 +13,7 @@ target_link_libraries(z_generals PRIVATE
     safedisc
     vfw32
     winmm
+    z_debug
     z_gameengine
     z_gameenginedevice
     z_profile

GeneralsMD/Code/Tools/GUIEdit/CMakeLists.txt

@@ -54,6 +54,7 @@ target_link_libraries(z_guiedit PRIVATE
     stlport
     vfw32
     winmm
+    z_debug
     z_gameengine
     z_gameenginedevice
     z_profile

GeneralsMD/Code/Tools/ImagePacker/CMakeLists.txt

@@ -33,6 +33,7 @@ target_link_libraries(z_imagepacker PRIVATE
     imm32
     vfw32
     winmm
+    z_debug
     z_gameengine
     z_gameenginedevice
     z_profile

GeneralsMD/Code/Tools/MapCacheBuilder/CMakeLists.txt

@@ -19,6 +19,7 @@ target_link_libraries(z_mapcachebuilder PRIVATE
     imm32
     vfw32
     winmm
+    z_debug
     z_gameengine
     z_gameenginedevice
     z_profile