[ZH] Upgrade Zero Hour Tools to c++20 (TheSuperHackers#509)

xezon · xezon · commit dc1c88a12bcc · 2025-03-28T00:56:20.000+01:00
diff --git a/GeneralsMD/Code/Libraries/Source/Compression/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/Compression/CMakeLists.txt
@@ -29,6 +29,7 @@ target_include_directories(z_compression INTERFACE
 )
 
 target_link_libraries(z_compression PRIVATE
+    gz_config
     zi_libraries_include
 )
 
diff --git a/GeneralsMD/Code/Tools/Autorun/CMakeLists.txt b/GeneralsMD/Code/Tools/Autorun/CMakeLists.txt
@@ -49,19 +49,20 @@ set(AUTORUN_SRC
 )
 
 macro(setup_autorun appname)
-add_executable(${appname} WIN32)
+    add_executable(${appname} WIN32)
 
-target_sources(${appname} PRIVATE ${AUTORUN_SRC})
+    target_sources(${appname} PRIVATE ${AUTORUN_SRC})
 
-target_link_libraries(${appname} PRIVATE
-    gz_utility
-    winmm
-    zi_libraries_include
-)
+    target_link_libraries(${appname} PRIVATE
+        gz_config
+        gz_utility
+        winmm
+        zi_libraries_include
+    )
 
-if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    target_sources(${appname} PRIVATE AUTORUN.RC)
-endif()
+    if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+        target_sources(${appname} PRIVATE AUTORUN.RC)
+    endif()
 endmacro()
 
 setup_autorun(z_autorun_en)
diff --git a/GeneralsMD/Code/Tools/Babylon/CMakeLists.txt b/GeneralsMD/Code/Tools/Babylon/CMakeLists.txt
@@ -56,6 +56,10 @@ set_target_properties(z_babylon PROPERTIES OUTPUT_NAME babylon)
 
 target_sources(z_babylon PRIVATE ${BABYLON_SRC})
 
+target_link_libraries(z_babylon PRIVATE
+    gz_config
+)
+
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
     target_compile_definitions(z_babylon PRIVATE _AFXDLL)
     target_sources(z_babylon PRIVATE Babylon.rc)
diff --git a/GeneralsMD/Code/Tools/CRCDiff/CMakeLists.txt b/GeneralsMD/Code/Tools/CRCDiff/CMakeLists.txt
@@ -15,6 +15,7 @@ set_target_properties(z_crcdiff PROPERTIES OUTPUT_NAME crcdiff)
 target_sources(z_crcdiff PRIVATE ${CRCDIFF_SRC})
 
 target_link_libraries(z_crcdiff PRIVATE
+    gz_config
     gz_utility
     stlport
 )
diff --git a/GeneralsMD/Code/Tools/Compress/CMakeLists.txt b/GeneralsMD/Code/Tools/Compress/CMakeLists.txt
@@ -10,6 +10,7 @@ set_target_properties(z_compress PROPERTIES OUTPUT_NAME compress)
 target_sources(z_compress PRIVATE ${COMRPESS_SRC})
 
 target_link_libraries(z_compress PRIVATE
+    gz_config
     z_compression
     zi_libraries_include
     zi_libraries_source
diff --git a/GeneralsMD/Code/Tools/DebugWindow/CMakeLists.txt b/GeneralsMD/Code/Tools/DebugWindow/CMakeLists.txt
@@ -13,6 +13,10 @@ set_target_properties(z_debugwindow PROPERTIES OUTPUT_NAME debugwindow)
 
 target_sources(z_debugwindow PRIVATE ${DEBUGWINDOW_SRC})
 
+target_link_libraries(z_debugwindow PRIVATE
+    gz_config
+)
+
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
     target_compile_definitions(z_debugwindow PRIVATE _AFXDLL)
     target_sources(z_debugwindow PRIVATE
diff --git a/GeneralsMD/Code/Tools/Launcher/CMakeLists.txt b/GeneralsMD/Code/Tools/Launcher/CMakeLists.txt
@@ -65,6 +65,7 @@ target_compile_definitions(z_launcher PRIVATE
 
 target_link_libraries(z_launcher PRIVATE
     comctl32
+    gz_config
     gz_utility
     safedisc
 )
diff --git a/GeneralsMD/Code/Tools/Launcher/DatGen/CMakeLists.txt b/GeneralsMD/Code/Tools/Launcher/DatGen/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(z_datgen PRIVATE
 )
 
 target_link_libraries(z_datgen PRIVATE
+    gz_config
     safedisc
 )
 
diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt b/GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(z_particleeditor PRIVATE
     d3d8lib
     dbghelplib
     imm32
+    gz_config
     gz_utility
     stlport
     vfw32
diff --git a/GeneralsMD/Code/Tools/assetcull/CMakeLists.txt b/GeneralsMD/Code/Tools/assetcull/CMakeLists.txt
@@ -7,6 +7,10 @@ set_target_properties(z_assetcull PROPERTIES OUTPUT_NAME assetcull)
 
 target_sources(z_assetcull PRIVATE ${ASSETCULL_SRC})
 
+target_link_libraries(z_assetcull PRIVATE
+    gz_config
+)
+
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
     target_link_options(z_assetcull PRIVATE /subsystem:console)
 endif()
diff --git a/GeneralsMD/Code/Tools/buildVersionUpdate/CMakeLists.txt b/GeneralsMD/Code/Tools/buildVersionUpdate/CMakeLists.txt
@@ -6,3 +6,7 @@ add_executable(z_buildversionupdate WIN32)
 set_target_properties(z_buildversionupdate PROPERTIES OUTPUT_NAME buildversionupdate)
 
 target_sources(z_buildversionupdate PRIVATE ${BUILDVERSIONUPDATE_SRC})
+
+target_link_libraries(z_buildversionupdate PRIVATE
+    gz_config
+)
diff --git a/GeneralsMD/Code/Tools/mangler/CMakeLists.txt b/GeneralsMD/Code/Tools/mangler/CMakeLists.txt
@@ -62,7 +62,10 @@ set_target_properties(z_manglerlib PROPERTIES OUTPUT_NAME manglerlib)
 target_sources(z_manglerlib PUBLIC ${MANGLERLIB_SRC})
 target_include_directories(z_manglerlib PRIVATE . wlib wnet)
 target_link_libraries(z_manglerlib PRIVATE wsock32)
-target_link_libraries(z_manglerlib PUBLIC gz_utility)
+target_link_libraries(z_manglerlib PUBLIC
+    gz_config
+    gz_utility
+)
 
 # mangler app
 
diff --git a/GeneralsMD/Code/Tools/matchbot/CMakeLists.txt b/GeneralsMD/Code/Tools/matchbot/CMakeLists.txt
@@ -68,6 +68,7 @@ target_include_directories(z_matchbot PRIVATE . wlib wnet)
 
 target_link_libraries(z_matchbot PRIVATE
     gamespy::gamespy
+    gz_config
     gz_utility
     stlport
 )
diff --git a/GeneralsMD/Code/Tools/textureCompress/CMakeLists.txt b/GeneralsMD/Code/Tools/textureCompress/CMakeLists.txt
@@ -8,6 +8,10 @@ set_target_properties(z_texturecompress PROPERTIES OUTPUT_NAME texturecompress)
 
 target_sources(z_texturecompress PRIVATE ${TEXTURECOMPRESS_SRC})
 
+target_link_libraries(z_texturecompress PRIVATE
+    gz_config
+)
+
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
     target_sources(z_texturecompress PRIVATE textureCompress.rc)
 endif()
diff --git a/GeneralsMD/Code/Tools/timingTest/CMakeLists.txt b/GeneralsMD/Code/Tools/timingTest/CMakeLists.txt
@@ -10,6 +10,7 @@ set_target_properties(z_timingtest PROPERTIES OUTPUT_NAME timingtest)
 target_sources(z_timingtest PRIVATE ${TIMINGTEST_SRC})
 
 target_link_libraries(z_timingtest PRIVATE
+    gz_config
     gz_utility
     winmm
 )
diff --git a/GeneralsMD/Code/Tools/versionUpdate/CMakeLists.txt b/GeneralsMD/Code/Tools/versionUpdate/CMakeLists.txt
@@ -6,3 +6,7 @@ add_executable(z_versionupdate WIN32)
 set_target_properties(z_versionupdate PROPERTIES OUTPUT_NAME versionupdate)
 
 target_sources(z_versionupdate PRIVATE ${VERSIONUPDATE_SRC})
+
+target_link_libraries(z_versionupdate PRIVATE
+    gz_config
+)
diff --git a/GeneralsMD/Code/Tools/wolSetup/CMakeLists.txt b/GeneralsMD/Code/Tools/wolSetup/CMakeLists.txt
@@ -21,6 +21,7 @@ set_target_properties(z_wolsetup PROPERTIES OUTPUT_NAME wolsetup)
 target_sources(z_wolsetup PRIVATE ${WOLSETUP_SRC})
 
 target_link_libraries(z_wolsetup PRIVATE
+    gz_config
     Version
 )
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ target_include_directories(z_compression INTERFACE`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`target_link_libraries(z_compression PRIVATE`
	`32`	`+ gz_config`
`32`	`33`	`zi_libraries_include`
`33`	`34`	`)`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ set_target_properties(z_crcdiff PROPERTIES OUTPUT_NAME crcdiff)`
`15`	`15`	`target_sources(z_crcdiff PRIVATE ${CRCDIFF_SRC})`
`16`	`16`
`17`	`17`	`target_link_libraries(z_crcdiff PRIVATE`
	`18`	`+ gz_config`
`18`	`19`	`gz_utility`
`19`	`20`	`stlport`
`20`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ target_compile_definitions(z_launcher PRIVATE`
`65`	`65`
`66`	`66`	`target_link_libraries(z_launcher PRIVATE`
`67`	`67`	`comctl32`
	`68`	`+ gz_config`
`68`	`69`	`gz_utility`
`69`	`70`	`safedisc`
`70`	`71`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ target_include_directories(z_datgen PRIVATE`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`target_link_libraries(z_datgen PRIVATE`
	`18`	`+ gz_config`
`18`	`19`	`safedisc`
`19`	`20`	`)`
`20`	`21`