TheSuperHackers · xezon · Apr 24, 2025 · Apr 22, 2025
diff --git a/Core/Tools/CMakeLists.txt b/Core/Tools/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 # Build useful tool binaries.
 if(RTS_BUILD_CORE_TOOLS)
-    # TODO: add subdirectory...
+    add_subdirectory(DebugWindow)
 endif()
 
 # Build less useful tool/test binaries.

diff --git a/Core/Tools/DebugWindow/CMakeLists.txt b/Core/Tools/DebugWindow/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(DEBUGWINDOW_SRC
+    "DebugWindow.cpp"
+    "DebugWindow.h"
+    "DebugWindowDialog.cpp"
+    "DebugWindowDialog.h"
+    "DebugWindowExport.h"
+    "StdAfx.cpp"
+    "StdAfx.h"
+)
+
+add_library(core_debugwindow SHARED)
+
+target_sources(core_debugwindow PRIVATE ${DEBUGWINDOW_SRC})
+
+target_link_libraries(core_debugwindow PRIVATE
+    core_config
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_compile_definitions(core_debugwindow PRIVATE _AFXDLL)
+    target_sources(core_debugwindow PRIVATE
+        DebugWindow.rc
+        DebugWindow.def
+    )
+    set_target_properties(core_debugwindow PROPERTIES OUTPUT_NAME DebugWindow)
+else()
+    set_target_properties(core_debugwindow PROPERTIES OUTPUT_NAME debugwindow)
+endif()
diff --git a/...MD/Code/Tools/DebugWindow/DebugWindow.cpp → Core/Tools/DebugWindow/DebugWindow.cpp b/...MD/Code/Tools/DebugWindow/DebugWindow.cpp → Core/Tools/DebugWindow/DebugWindow.cpp
diff --git a/...ls/Code/Tools/DebugWindow/DebugWindow.def → Core/Tools/DebugWindow/DebugWindow.def b/...ls/Code/Tools/DebugWindow/DebugWindow.def → Core/Tools/DebugWindow/DebugWindow.def
diff --git a/...lsMD/Code/Tools/DebugWindow/DebugWindow.h → Core/Tools/DebugWindow/DebugWindow.h b/...lsMD/Code/Tools/DebugWindow/DebugWindow.h → Core/Tools/DebugWindow/DebugWindow.h
diff --git a/...als/Code/Tools/DebugWindow/DebugWindow.rc → Core/Tools/DebugWindow/DebugWindow.rc b/...als/Code/Tools/DebugWindow/DebugWindow.rc → Core/Tools/DebugWindow/DebugWindow.rc
diff --git a/...e/Tools/DebugWindow/DebugWindowDialog.cpp → Core/Tools/DebugWindow/DebugWindowDialog.cpp b/...e/Tools/DebugWindow/DebugWindowDialog.cpp → Core/Tools/DebugWindow/DebugWindowDialog.cpp
diff --git a/...ode/Tools/DebugWindow/DebugWindowDialog.h → Core/Tools/DebugWindow/DebugWindowDialog.h b/...ode/Tools/DebugWindow/DebugWindowDialog.h → Core/Tools/DebugWindow/DebugWindowDialog.h
diff --git a/...ode/Tools/DebugWindow/DebugWindowExport.h → Core/Tools/DebugWindow/DebugWindowExport.h b/...ode/Tools/DebugWindow/DebugWindowExport.h → Core/Tools/DebugWindow/DebugWindowExport.h
diff --git a/GeneralsMD/Code/Tools/DebugWindow/Resource.h → Core/Tools/DebugWindow/Resource.h b/GeneralsMD/Code/Tools/DebugWindow/Resource.h → Core/Tools/DebugWindow/Resource.h
diff --git a/GeneralsMD/Code/Tools/DebugWindow/StdAfx.cpp → Core/Tools/DebugWindow/StdAfx.cpp b/GeneralsMD/Code/Tools/DebugWindow/StdAfx.cpp → Core/Tools/DebugWindow/StdAfx.cpp
diff --git a/GeneralsMD/Code/Tools/DebugWindow/StdAfx.h → Core/Tools/DebugWindow/StdAfx.h b/GeneralsMD/Code/Tools/DebugWindow/StdAfx.h → Core/Tools/DebugWindow/StdAfx.h
diff --git a/...als/Code/Tools/DebugWindow/post-build.bat → Core/Tools/DebugWindow/post-build.bat b/...als/Code/Tools/DebugWindow/post-build.bat → Core/Tools/DebugWindow/post-build.bat
diff --git a/...ode/Tools/DebugWindow/res/DebugWindow.rc2 → Core/Tools/DebugWindow/res/DebugWindow.rc2 b/...ode/Tools/DebugWindow/res/DebugWindow.rc2 → Core/Tools/DebugWindow/res/DebugWindow.rc2
diff --git a/Generals/Code/Tools/CMakeLists.txt b/Generals/Code/Tools/CMakeLists.txt
@@ -2,7 +2,6 @@
 
 # Build useful tool binaries.
 if(RTS_BUILD_GENERALS_TOOLS)
-    add_subdirectory(DebugWindow)
     add_subdirectory(GUIEdit)
     add_subdirectory(ImagePacker)
     add_subdirectory(MapCacheBuilder)

diff --git a/Generals/Code/Tools/DebugWindow/CMakeLists.txt b/Generals/Code/Tools/DebugWindow/CMakeLists.txt
diff --git a/Generals/Code/Tools/DebugWindow/DebugWindow.cpp b/Generals/Code/Tools/DebugWindow/DebugWindow.cpp
diff --git a/Generals/Code/Tools/DebugWindow/DebugWindow.h b/Generals/Code/Tools/DebugWindow/DebugWindow.h