Implement options to control building internal and debug code. (#441)

Adds additional configure presets to build these on vc6.
Adds an additional config for loading into Visual Studio without breaking ninja.

Author: OmniBlade

CMakeLists.txt

@@ -33,6 +33,12 @@ endif()
 # Top level project, doesn't really affect anything.
 project(genzh LANGUAGES C CXX)
 
+# Create PDB for Release as long as debug info was generated during compile.
+if(MSVC)
+    string(APPEND CMAKE_EXE_LINKER_FLAGS_RELEASE " /DEBUG /OPT:REF /OPT:ICF")
+    string(APPEND CMAKE_SHARED_LINKER_FLAGS_RELEASE " /DEBUG /OPT:REF /OPT:ICF")
+endif()
+
 include(FetchContent)
 
 # Find/Add build dependencies and stubs shared by all projects
@@ -51,15 +57,11 @@ add_subdirectory(Dependencies/Benchmark)
 add_subdirectory(Dependencies/SafeDisc)
 add_subdirectory(Dependencies/MaxSDK)
 
-# EA Compression library, shared between games (diff is comments only)
-#add_subdirectory(GeneralsMD/Code/Libraries/Source/Compression)
-
-# BrowserDispatch COM object interface (No difference)
-#add_subdirectory(GeneralsMD/Code/Libraries/Source/EABrowserDispatch)
-
 # Do we want to build extra SDK stuff or just the game binary?
 option(GENZH_BUILD_ZEROHOUR "Build Zero Hour code." ON)
 option(GENZH_BUILD_GENERALS "Build Generals code." ON)
+option(GENZH_BUILD_INTERNAL "Build code with the \"Internal\" configuration." OFF)
+option(GENZH_BUILD_PROFILE "Build code with the \"Profile\" configuration." OFF)
 
 if(NOT GENZH_BUILD_ZEROHOUR AND NOT GENZH_BUILD_GENERALS)
     set(GENZH_BUILD_ZEROHOUR TRUE)
@@ -68,6 +70,27 @@ endif()
 
 add_feature_info(ZeroHourStuff GENZH_BUILD_ZEROHOUR "Build Zero Hour code")
 add_feature_info(GeneralsStuff GENZH_BUILD_GENERALS "Build Generals code")
+add_feature_info(InternalBuild GENZH_BUILD_INTERNAL "Building as an \"Internal\" build")
+add_feature_info(ProfileBuild GENZH_BUILD_PROFILE "Building as a \"Profile\" build")
+
+add_library(gz_config INTERFACE)
+
+target_compile_options(gz_config INTERFACE ${GENZH_FLAGS})
+
+target_compile_definitions(gz_config INTERFACE $<IF:$<CONFIG:Debug>,_DEBUG WWDEBUG DEBUG,_RELEASE>)
+
+# This disables a lot of warnings steering developers to use windows only functions/function names.
+if(MSVC)
+    target_compile_definitions(gz_config INTERFACE _CRT_NONSTDC_NO_WARNINGS _CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(GENZH_BUILD_PROFILE)
+    target_compile_definitions(gz_config INTERFACE _PROFILE)
+endif()
+
+if(GENZH_BUILD_INTERNAL)
+    target_compile_definitions(gz_config INTERFACE _INTERNAL)
+endif()
 
 # Add main build targets
 if(GENZH_BUILD_ZEROHOUR)

CMakePresets.json

@@ -8,20 +8,47 @@
     "configurePresets": [
         {
             "name": "vc6",
-            "displayName": "Build Zero Hour Binaries with NMake",
+            "displayName": "Build Binaries with NMake",
             "generator": "NMake Makefiles",
             "hidden": false,
             "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",    
+                "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
+                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",  
                 "CMAKE_BUILD_TYPE": "Release",
                 "GENZH_FLAGS": "/W3"
             }
         },
+        {
+            "name": "vc6prof",
+            "displayName": "Build Profiling Binaries with NMake",
+            "hidden": false,
+            "inherits": "vc6",
+            "cacheVariables": {
+                "GENZH_BUILD_PROFILE": "ON"
+            }
+        },
+        {
+            "name": "vc6int",
+            "displayName": "Build Internal Binaries with NMake",
+            "inherits": "vc6",
+            "cacheVariables": {
+                "GENZH_BUILD_INTERNAL": "ON"
+            }
+        },       
+        {
+            "name": "vc6debug",
+            "displayName": "Build Debug Binaries with NMake",
+            "hidden": false,
+            "inherits": "vc6",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
         {
             "name": "default",
-            "displayName": "Default Config",
+            "displayName": "Default Config (don't use directly!)",
             "generator": "Ninja Multi-Config",
             "hidden": true,
             "binaryDir": "${sourceDir}/build/${presetName}",
@@ -32,9 +59,43 @@
             }
         },
         {
-            "name": "win32",
+            "name": "msvc32",
             "architecture": "Win32",
             "inherits": "default",
+            "generator": "Visual Studio 17 2022",
+            "hidden": false,
+            "displayName": "Visual Studio Win32 build",
+            "cacheVariables": {
+                "GENZH_FLAGS": "/W3"
+            }
+        },
+        {
+            "name": "msvc32prof",
+            "inherits": "msvc32",
+            "displayName": "Visual Studio Win32 Profile build",
+            "cacheVariables": {
+                "GENZH_BUILD_PROFILE": "ON"
+            }
+        },
+        {
+            "name": "msvc32int",
+            "inherits": "msvc32",
+            "displayName": "Visual Studio Win32 Internal build",
+            "cacheVariables": {
+                "GENZH_BUILD_INTERNAL": "ON"
+            }
+        },
+        {
+            "name": "msvc32debug",
+            "inherits": "msvc32",
+            "displayName": "Visual Studio Win32 Debug build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "win32",
+            "inherits": "default",
             "hidden": false,
             "displayName": "Win32 build",
             "cacheVariables": {
@@ -53,6 +114,12 @@
         }
     ],
     "buildPresets": [
+        {
+            "name": "vc6",
+            "configurePreset": "vc6",
+            "displayName": "Build VC6 Windows build",
+            "description": "Build VC6 Windows build"
+        },
         {
             "name": "win32",
             "configurePreset": "win32",
@@ -69,6 +136,19 @@
         }
     ],
     "workflowPresets": [
+        {
+            "name": "vc6",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "vc6"
+                },
+                {
+                    "type": "build",
+                    "name": "vc6"
+                }
+            ]
+        },
         {
             "name": "win32",
             "steps": [

Generals/Code/GameEngine/CMakeLists.txt

@@ -1058,7 +1058,14 @@ set(GAMEENGINE_SRC
 )
 
 add_library(g_gameengine STATIC)
-set_target_properties(g_gameengine PROPERTIES OUTPUT_NAME $<IF:$<CONFIG:Debug>,gameenginedebug,gameengine>)
+
+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()
 
 target_sources(g_gameengine PRIVATE ${GAMEENGINE_SRC})
 
@@ -1079,19 +1086,11 @@ target_link_libraries(g_gameengine PUBLIC
     g_browserdispatch
     g_compression
     g_wwvegas
+    gz_config
     gamespy::gamespy
     stlport
 )
 
-target_compile_options(g_gameengine INTERFACE
-    ${GENZH_FLAGS}
-)
-
 target_compile_definitions(g_gameengine PRIVATE
     IG_DEBUG_STACKTRACE
 )
-
-target_compile_definitions(g_gameengine PUBLIC
-    $<$<CONFIG:Debug>:_DEBUG>
-    $<$<CONFIG:Debug>:DEBUG>
-)

Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt

@@ -1,19 +1,9 @@
 # Interface libraries to set common defines and includes, avoid duplication later
 add_library(g_wwcommon INTERFACE)
 
-target_compile_definitions(g_wwcommon INTERFACE
-    #NOMINMAX
-    WIN32_LEAN_AND_MEAN
-    $<$<CONFIG:Debug>:WWDEBUG>
-    $<$<CONFIG:Debug>:_DEBUG>
-)
-
-target_compile_options(g_wwcommon INTERFACE
-    ${WARNING_FLAGS}
-)
-
 target_link_libraries(g_wwcommon INTERFACE
     d3d8lib
+    gz_config
     milesstub
     stlport
 )

Generals/Code/Tools/WW3D/max2w3d/CMakeLists.txt

@@ -164,8 +164,8 @@ target_link_libraries(g_max2w3d PRIVATE
     # The headers typedef INT_PTR to different types, but maxsdk expects it
     # typedef'ed to int, otherwise throws linker errors.
     d3d8lib
+    g_pluglib
     maxsdk
-    pluglib
     winmm
 )
 

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -1143,6 +1143,14 @@ 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()
+
 target_sources(z_gameengine PRIVATE ${GAMEENGINE_SRC})
 
 target_include_directories(z_gameengine PUBLIC
@@ -1161,21 +1169,13 @@ target_link_libraries(z_gameengine PRIVATE
 target_link_libraries(z_gameengine PUBLIC
     d3d8lib
     gamespy::gamespy
+    gz_config
     stlport
     z_browserdispatch
     z_compression
     z_wwvegas
 )
 
-target_compile_options(z_gameengine INTERFACE
-    ${GENZH_FLAGS}
-)
-
 target_compile_definitions(z_gameengine PRIVATE
     IG_DEBUG_STACKTRACE
 )
-
-target_compile_definitions(z_gameengine PUBLIC
-    $<$<CONFIG:Debug>:_DEBUG>
-    $<$<CONFIG:Debug>:DEBUG>
-)

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

@@ -4,16 +4,11 @@ add_library(z_wwcommon INTERFACE)
 target_compile_definitions(z_wwcommon INTERFACE
     #NOMINMAX
     WIN32_LEAN_AND_MEAN
-    $<$<CONFIG:Debug>:WWDEBUG>
-    $<$<CONFIG:Debug>:_DEBUG>
-)
-
-target_compile_options(z_wwcommon INTERFACE
-    ${GENZH_FLAGS}
 )
 
 target_link_libraries(z_wwcommon INTERFACE
     d3d8lib
+    gz_config
     milesstub
     stlport
 )

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

@@ -1,21 +1,21 @@
 set(PROFILE_SRC
-	"profile_funclevel.cpp"
-	"profile_funclevel.h"
-	"profile_highlevel.cpp"
-	"profile_highlevel.h"
-	"profile_result.cpp"
-	"profile_result.h"
-	"_pch.cpp"
-	"_pch.h"
-	"internal.h"
-	"internal_cmd.h"
-	"internal_funclevel.h"
-	"internal_highlevel.h"
-	"internal_result.h"
-	"profile.cpp"
-	"profile.h"
-	"profile_cmd.cpp"
-	"profile_doc.h"
+    "profile_funclevel.cpp"
+    "profile_funclevel.h"
+    "profile_highlevel.cpp"
+    "profile_highlevel.h"
+    "profile_result.cpp"
+    "profile_result.h"
+    "_pch.cpp"
+    "_pch.h"
+    "internal.h"
+    "internal_cmd.h"
+    "internal_funclevel.h"
+    "internal_highlevel.h"
+    "internal_result.h"
+    "profile.cpp"
+    "profile.h"
+    "profile_cmd.cpp"
+    "profile_doc.h"
 )
 
 add_library(z_profile STATIC)
@@ -31,4 +31,10 @@ target_link_libraries(z_profile PRIVATE
     zi_libraries_include
 )
 
-set_target_properties(z_profile PROPERTIES OUTPUT_NAME $<IF:$<CONFIG:Debug>,profiledebug,profile>)
+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/Tools/WW3D/max2w3d/CMakeLists.txt

@@ -165,8 +165,8 @@ target_link_libraries(z_max2w3d PRIVATE
     # typedef'ed to int, otherwise throws linker errors.
     d3d8lib
     maxsdk
-    pluglib
     winmm
+    z_pluglib
 )
 
 set_target_properties(z_max2w3d PROPERTIES LINK_FLAGS "/DEF:max2w3d.def")