[CMAKE][CORE] Move WWLib and WWDebug to Core (#663)

Author: feliwir

Core/CMakeLists.txt

@@ -1,8 +1,14 @@
 # c stands for core, i stands for Interface
 add_library(corei_libraries_include INTERFACE)
+add_library(corei_libraries_source_wwvegas INTERFACE)
+add_library(corei_libraries_source_wwvegas_wwdebug INTERFACE)
+add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(corei_always INTERFACE)
 
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
+target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
+target_include_directories(corei_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
+target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
 target_link_libraries(corei_always INTERFACE
     core_utility
     corei_libraries_include

Core/Libraries/CMakeLists.txt

@@ -1,5 +1,5 @@
 # WW common libraries decended from earliest C&C games
-#add_subdirectory(Source/WWVegas)
+add_subdirectory(Source/WWVegas)
 
 # profiling library
 #add_subdirectory(Source/profile)

Core/Libraries/Source/WWVegas/CMakeLists.txt

@@ -0,0 +1,57 @@
+# Interface libraries to set common defines and includes, avoid duplication later
+add_library(core_wwcommon INTERFACE)
+
+target_compile_definitions(core_wwcommon INTERFACE
+    #NOMINMAX
+    WIN32_LEAN_AND_MEAN
+)
+
+target_link_libraries(core_wwcommon INTERFACE
+    d3d8lib
+    core_config
+    core_utility
+    milesstub
+    stlport
+)
+
+target_include_directories(core_wwcommon INTERFACE
+    .
+    WWDebug
+    WWLib
+)
+
+# add_subdirectory(WWAudio)
+add_subdirectory(WWDebug)
+add_subdirectory(WWLib)
+# add_subdirectory(WWMath)
+# add_subdirectory(Wwutil)
+# add_subdirectory(WWSaveLoad)
+# add_subdirectory(WW3D2)
+# add_subdirectory(WWDownload)
+# add_subdirectory(wwshade)
+
+# Helpful interface to bundle the ww modules together.
+add_library(core_wwvegas INTERFACE)
+
+target_include_directories(core_wwvegas INTERFACE
+    .
+    #WW3D2
+    WWDebug
+    #WWDownload
+    WWLib
+    #WWMath
+    #WWSaveLoad
+    #Wwutil
+    #wwshade
+)
+
+target_link_libraries(core_wwvegas INTERFACE
+    # core_ww3d2
+    core_wwdebug
+    # core_wwdownload
+    core_wwlib
+    # core_wwmath
+    # core_wwsaveload
+    # core_wwshade
+    # core_wwutil
+)

Core/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt

@@ -0,0 +1,21 @@
+# Set source files
+set(WWDEBUG_SRC
+    wwdebug.cpp
+    wwdebug.h
+    wwhack.h
+    wwmemlog.cpp
+    wwmemlog.h
+    wwprofile.cpp
+    wwprofile.h
+)
+
+# Targets to build.
+add_library(core_wwdebug STATIC)
+set_target_properties(core_wwdebug PROPERTIES OUTPUT_NAME wwdebug)
+
+target_sources(core_wwdebug PRIVATE ${WWDEBUG_SRC})
+
+target_link_libraries(core_wwdebug PRIVATE
+    core_wwcommon
+    corei_always
+)

GeneralsMD/Code/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp renamed to Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp

@@ -110,7 +110,8 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 ** WWDEBUG_SAY(("dir = %f\n",dir));
 */
 
-#include "../../../../GameEngine/Include/Common/Debug.h"
+// TheSuperHackers @compile feliwir 12/04/2025 Both Debug headers are identical. Use ZH.
+#include "../../../../../GeneralsMD/Code/GameEngine/Include/Common/Debug.h"
 
 #ifdef DEBUG_LOGGING
 #define WWDEBUG_SAY(x)							DEBUG_LOG(x)