TheSuperHackers · feliwir · Apr 14, 2025 · Apr 14, 2025
diff --git a/Core/CMakeLists.txt b/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

diff --git a/Core/Libraries/CMakeLists.txt b/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)

diff --git a/Core/Libraries/Source/WWVegas/CMakeLists.txt b/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
+)
diff --git a/Core/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt b/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
+)
diff --git a/...raries/Source/WWVegas/WWDebug/wwdebug.cpp → ...raries/Source/WWVegas/WWDebug/wwdebug.cpp b/...raries/Source/WWVegas/WWDebug/wwdebug.cpp → ...raries/Source/WWVegas/WWDebug/wwdebug.cpp
diff --git a/...ibraries/Source/WWVegas/WWDebug/wwdebug.h → ...ibraries/Source/WWVegas/WWDebug/wwdebug.h b/...ibraries/Source/WWVegas/WWDebug/wwdebug.h → ...ibraries/Source/WWVegas/WWDebug/wwdebug.h
@@ -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)

diff --git a/...Libraries/Source/WWVegas/WWDebug/wwhack.h → ...Libraries/Source/WWVegas/WWDebug/wwhack.h b/...Libraries/Source/WWVegas/WWDebug/wwhack.h → ...Libraries/Source/WWVegas/WWDebug/wwhack.h
diff --git a/...aries/Source/WWVegas/WWDebug/wwmemlog.cpp → ...aries/Source/WWVegas/WWDebug/wwmemlog.cpp b/...aries/Source/WWVegas/WWDebug/wwmemlog.cpp → ...aries/Source/WWVegas/WWDebug/wwmemlog.cpp
diff --git a/...braries/Source/WWVegas/WWDebug/wwmemlog.h → ...braries/Source/WWVegas/WWDebug/wwmemlog.h b/...braries/Source/WWVegas/WWDebug/wwmemlog.h → ...braries/Source/WWVegas/WWDebug/wwmemlog.h
diff --git a/...ries/Source/WWVegas/WWDebug/wwprofile.cpp → ...ries/Source/WWVegas/WWDebug/wwprofile.cpp b/...ries/Source/WWVegas/WWDebug/wwprofile.cpp → ...ries/Source/WWVegas/WWDebug/wwprofile.cpp
diff --git a/...raries/Source/WWVegas/WWDebug/wwprofile.h → ...raries/Source/WWVegas/WWDebug/wwprofile.h b/...raries/Source/WWVegas/WWDebug/wwprofile.h → ...raries/Source/WWVegas/WWDebug/wwprofile.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/BSEARCH.H → .../Libraries/Source/WWVegas/WWLib/BSEARCH.H b/.../Libraries/Source/WWVegas/WWLib/BSEARCH.H → .../Libraries/Source/WWVegas/WWLib/BSEARCH.H
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/BUFF.H → Core/Libraries/Source/WWVegas/WWLib/BUFF.H b/...ode/Libraries/Source/WWVegas/WWLib/BUFF.H → Core/Libraries/Source/WWVegas/WWLib/BUFF.H
diff --git a/...aries/Source/WWVegas/WWLib/CMakeLists.txt → ...aries/Source/WWVegas/WWLib/CMakeLists.txt b/...aries/Source/WWVegas/WWLib/CMakeLists.txt → ...aries/Source/WWVegas/WWLib/CMakeLists.txt
@@ -153,16 +153,16 @@ set(WWLIB_SRC
 )
 
 # Targets to build.
-add_library(z_wwlib STATIC)
-set_target_properties(z_wwlib PROPERTIES OUTPUT_NAME wwlib)
+add_library(core_wwlib STATIC)
+set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib)
 
-target_sources(z_wwlib PRIVATE ${WWLIB_SRC})
+target_sources(core_wwlib PRIVATE ${WWLIB_SRC})
 
-target_include_directories(z_wwlib PUBLIC
+target_include_directories(core_wwlib PUBLIC
     .
 )
 
-target_link_libraries(z_wwlib PRIVATE
-    z_wwcommon
-    zi_always
+target_link_libraries(core_wwlib PRIVATE
+    core_wwcommon
+    corei_always
 )
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/CRC.H → Core/Libraries/Source/WWVegas/WWLib/CRC.H b/...Code/Libraries/Source/WWVegas/WWLib/CRC.H → Core/Libraries/Source/WWVegas/WWLib/CRC.H
diff --git a/...aries/Source/WWVegas/WWLib/CallbackHook.h → ...aries/Source/WWVegas/WWLib/CallbackHook.h b/...aries/Source/WWVegas/WWLib/CallbackHook.h → ...aries/Source/WWVegas/WWLib/CallbackHook.h
diff --git a/...Libraries/Source/WWVegas/WWLib/Except.cpp → ...Libraries/Source/WWVegas/WWLib/Except.cpp b/...Libraries/Source/WWVegas/WWLib/Except.cpp → ...Libraries/Source/WWVegas/WWLib/Except.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/Except.h → Core/Libraries/Source/WWVegas/WWLib/Except.h b/...e/Libraries/Source/WWVegas/WWLib/Except.h → Core/Libraries/Source/WWVegas/WWLib/Except.h
diff --git a/...es/Source/WWVegas/WWLib/FastAllocator.cpp → ...es/Source/WWVegas/WWLib/FastAllocator.cpp b/...es/Source/WWVegas/WWLib/FastAllocator.cpp → ...es/Source/WWVegas/WWLib/FastAllocator.cpp
diff --git a/...ries/Source/WWVegas/WWLib/FastAllocator.h → ...ries/Source/WWVegas/WWLib/FastAllocator.h b/...ries/Source/WWVegas/WWLib/FastAllocator.h → ...ries/Source/WWVegas/WWLib/FastAllocator.h
diff --git a/...Libraries/Source/WWVegas/WWLib/HASHLIST.H → ...Libraries/Source/WWVegas/WWLib/HASHLIST.H b/...Libraries/Source/WWVegas/WWLib/HASHLIST.H → ...Libraries/Source/WWVegas/WWLib/HASHLIST.H
diff --git a/...de/Libraries/Source/WWVegas/WWLib/INDEX.H → Core/Libraries/Source/WWVegas/WWLib/INDEX.H b/...de/Libraries/Source/WWVegas/WWLib/INDEX.H → Core/Libraries/Source/WWVegas/WWLib/INDEX.H
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/INI.H → Core/Libraries/Source/WWVegas/WWLib/INI.H b/...Code/Libraries/Source/WWVegas/WWLib/INI.H → Core/Libraries/Source/WWVegas/WWLib/INI.H
diff --git a/...Libraries/Source/WWVegas/WWLib/LISTNODE.H → ...Libraries/Source/WWVegas/WWLib/LISTNODE.H b/...Libraries/Source/WWVegas/WWLib/LISTNODE.H → ...Libraries/Source/WWVegas/WWLib/LISTNODE.H
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/MPU.H → Core/Libraries/Source/WWVegas/WWLib/MPU.H b/...Code/Libraries/Source/WWVegas/WWLib/MPU.H → Core/Libraries/Source/WWVegas/WWLib/MPU.H
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/PIPE.H → Core/Libraries/Source/WWVegas/WWLib/PIPE.H b/...ode/Libraries/Source/WWVegas/WWLib/PIPE.H → Core/Libraries/Source/WWVegas/WWLib/PIPE.H
diff --git a/...de/Libraries/Source/WWVegas/WWLib/Point.h → Core/Libraries/Source/WWVegas/WWLib/Point.h b/...de/Libraries/Source/WWVegas/WWLib/Point.h → Core/Libraries/Source/WWVegas/WWLib/Point.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/RAMFILE.H → .../Libraries/Source/WWVegas/WWLib/RAMFILE.H b/.../Libraries/Source/WWVegas/WWLib/RAMFILE.H → .../Libraries/Source/WWVegas/WWLib/RAMFILE.H
diff --git a/...e/Libraries/Source/WWVegas/WWLib/RANDOM.H → Core/Libraries/Source/WWVegas/WWLib/RANDOM.H b/...e/Libraries/Source/WWVegas/WWLib/RANDOM.H → Core/Libraries/Source/WWVegas/WWLib/RANDOM.H
diff --git a/.../Libraries/Source/WWVegas/WWLib/RAWFILE.H → .../Libraries/Source/WWVegas/WWLib/RAWFILE.H b/.../Libraries/Source/WWVegas/WWLib/RAWFILE.H → .../Libraries/Source/WWVegas/WWLib/RAWFILE.H
diff --git a/...de/Libraries/Source/WWVegas/WWLib/SLIST.H → Core/Libraries/Source/WWVegas/WWLib/SLIST.H b/...de/Libraries/Source/WWVegas/WWLib/SLIST.H → Core/Libraries/Source/WWVegas/WWLib/SLIST.H
diff --git a/...e/Libraries/Source/WWVegas/WWLib/SLNODE.H → Core/Libraries/Source/WWVegas/WWLib/SLNODE.H b/...e/Libraries/Source/WWVegas/WWLib/SLNODE.H → Core/Libraries/Source/WWVegas/WWLib/SLNODE.H
diff --git a/...de/Libraries/Source/WWVegas/WWLib/STRAW.H → Core/Libraries/Source/WWVegas/WWLib/STRAW.H b/...de/Libraries/Source/WWVegas/WWLib/STRAW.H → Core/Libraries/Source/WWVegas/WWLib/STRAW.H
diff --git a/...Libraries/Source/WWVegas/WWLib/Signaler.h → ...Libraries/Source/WWVegas/WWLib/Signaler.h b/...Libraries/Source/WWVegas/WWLib/Signaler.h → ...Libraries/Source/WWVegas/WWLib/Signaler.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/TARGA.CPP → .../Libraries/Source/WWVegas/WWLib/TARGA.CPP b/.../Libraries/Source/WWVegas/WWLib/TARGA.CPP → .../Libraries/Source/WWVegas/WWLib/TARGA.CPP
diff --git a/...de/Libraries/Source/WWVegas/WWLib/TARGA.H → Core/Libraries/Source/WWVegas/WWLib/TARGA.H b/...de/Libraries/Source/WWVegas/WWLib/TARGA.H → Core/Libraries/Source/WWVegas/WWLib/TARGA.H
diff --git a/...e/Libraries/Source/WWVegas/WWLib/Vector.H → Core/Libraries/Source/WWVegas/WWLib/Vector.H b/...e/Libraries/Source/WWVegas/WWLib/Vector.H → Core/Libraries/Source/WWVegas/WWLib/Vector.H
diff --git a/...raries/Source/WWVegas/WWLib/WWCOMUtil.cpp → ...raries/Source/WWVegas/WWLib/WWCOMUtil.cpp b/...raries/Source/WWVegas/WWLib/WWCOMUtil.cpp → ...raries/Source/WWVegas/WWLib/WWCOMUtil.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/WWCOMUtil.h → ...ibraries/Source/WWVegas/WWLib/WWCOMUtil.h b/...ibraries/Source/WWVegas/WWLib/WWCOMUtil.h → ...ibraries/Source/WWVegas/WWLib/WWCOMUtil.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/WWFILE.H → Core/Libraries/Source/WWVegas/WWLib/WWFILE.H b/...e/Libraries/Source/WWVegas/WWLib/WWFILE.H → Core/Libraries/Source/WWVegas/WWLib/WWFILE.H
diff --git a/...de/Libraries/Source/WWVegas/WWLib/XPIPE.H → Core/Libraries/Source/WWVegas/WWLib/XPIPE.H b/...de/Libraries/Source/WWVegas/WWLib/XPIPE.H → Core/Libraries/Source/WWVegas/WWLib/XPIPE.H
diff --git a/...e/Libraries/Source/WWVegas/WWLib/XSTRAW.H → Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H b/...e/Libraries/Source/WWVegas/WWLib/XSTRAW.H → Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H
diff --git a/...e/Libraries/Source/WWVegas/WWLib/always.h → Core/Libraries/Source/WWVegas/WWLib/always.h b/...e/Libraries/Source/WWVegas/WWLib/always.h → Core/Libraries/Source/WWVegas/WWLib/always.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/argv.cpp → Core/Libraries/Source/WWVegas/WWLib/argv.cpp b/...e/Libraries/Source/WWVegas/WWLib/argv.cpp → Core/Libraries/Source/WWVegas/WWLib/argv.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/argv.h → Core/Libraries/Source/WWVegas/WWLib/argv.h b/...ode/Libraries/Source/WWVegas/WWLib/argv.h → Core/Libraries/Source/WWVegas/WWLib/argv.h
diff --git a/...ibraries/Source/WWVegas/WWLib/b64pipe.cpp → ...ibraries/Source/WWVegas/WWLib/b64pipe.cpp b/...ibraries/Source/WWVegas/WWLib/b64pipe.cpp → ...ibraries/Source/WWVegas/WWLib/b64pipe.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/b64pipe.h → .../Libraries/Source/WWVegas/WWLib/b64pipe.h b/.../Libraries/Source/WWVegas/WWLib/b64pipe.h → .../Libraries/Source/WWVegas/WWLib/b64pipe.h
diff --git a/...braries/Source/WWVegas/WWLib/b64straw.cpp → ...braries/Source/WWVegas/WWLib/b64straw.cpp b/...braries/Source/WWVegas/WWLib/b64straw.cpp → ...braries/Source/WWVegas/WWLib/b64straw.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/b64straw.h → ...Libraries/Source/WWVegas/WWLib/b64straw.h b/...Libraries/Source/WWVegas/WWLib/b64straw.h → ...Libraries/Source/WWVegas/WWLib/b64straw.h
diff --git a/...Libraries/Source/WWVegas/WWLib/base64.cpp → ...Libraries/Source/WWVegas/WWLib/base64.cpp b/...Libraries/Source/WWVegas/WWLib/base64.cpp → ...Libraries/Source/WWVegas/WWLib/base64.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/base64.h → Core/Libraries/Source/WWVegas/WWLib/base64.h b/...e/Libraries/Source/WWVegas/WWLib/base64.h → Core/Libraries/Source/WWVegas/WWLib/base64.h
diff --git a/...braries/Source/WWVegas/WWLib/bfiofile.cpp → ...braries/Source/WWVegas/WWLib/bfiofile.cpp b/...braries/Source/WWVegas/WWLib/bfiofile.cpp → ...braries/Source/WWVegas/WWLib/bfiofile.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/bfiofile.h → ...Libraries/Source/WWVegas/WWLib/bfiofile.h b/...Libraries/Source/WWVegas/WWLib/bfiofile.h → ...Libraries/Source/WWVegas/WWLib/bfiofile.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/binheap.h → .../Libraries/Source/WWVegas/WWLib/binheap.h b/.../Libraries/Source/WWVegas/WWLib/binheap.h → .../Libraries/Source/WWVegas/WWLib/binheap.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/bittype.h → .../Libraries/Source/WWVegas/WWLib/bittype.h b/.../Libraries/Source/WWVegas/WWLib/bittype.h → .../Libraries/Source/WWVegas/WWLib/bittype.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/bound.h → Core/Libraries/Source/WWVegas/WWLib/bound.h b/...de/Libraries/Source/WWVegas/WWLib/bound.h → Core/Libraries/Source/WWVegas/WWLib/bound.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/buff.cpp → Core/Libraries/Source/WWVegas/WWLib/buff.cpp b/...e/Libraries/Source/WWVegas/WWLib/buff.cpp → Core/Libraries/Source/WWVegas/WWLib/buff.cpp
diff --git a/...braries/Source/WWVegas/WWLib/bufffile.cpp → ...braries/Source/WWVegas/WWLib/bufffile.cpp b/...braries/Source/WWVegas/WWLib/bufffile.cpp → ...braries/Source/WWVegas/WWLib/bufffile.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/bufffile.h → ...Libraries/Source/WWVegas/WWLib/bufffile.h b/...Libraries/Source/WWVegas/WWLib/bufffile.h → ...Libraries/Source/WWVegas/WWLib/bufffile.h
diff --git a/...ibraries/Source/WWVegas/WWLib/chunkio.cpp → ...ibraries/Source/WWVegas/WWLib/chunkio.cpp b/...ibraries/Source/WWVegas/WWLib/chunkio.cpp → ...ibraries/Source/WWVegas/WWLib/chunkio.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/chunkio.h → .../Libraries/Source/WWVegas/WWLib/chunkio.h b/.../Libraries/Source/WWVegas/WWLib/chunkio.h → .../Libraries/Source/WWVegas/WWLib/chunkio.h
diff --git a/...raries/Source/WWVegas/WWLib/cpudetect.cpp → ...raries/Source/WWVegas/WWLib/cpudetect.cpp b/...raries/Source/WWVegas/WWLib/cpudetect.cpp → ...raries/Source/WWVegas/WWLib/cpudetect.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/cpudetect.h → ...ibraries/Source/WWVegas/WWLib/cpudetect.h b/...ibraries/Source/WWVegas/WWLib/cpudetect.h → ...ibraries/Source/WWVegas/WWLib/cpudetect.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/crandom.h → .../Libraries/Source/WWVegas/WWLib/crandom.h b/.../Libraries/Source/WWVegas/WWLib/crandom.h → .../Libraries/Source/WWVegas/WWLib/crandom.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/crc.cpp → Core/Libraries/Source/WWVegas/WWLib/crc.cpp b/...de/Libraries/Source/WWVegas/WWLib/crc.cpp → Core/Libraries/Source/WWVegas/WWLib/crc.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/crcpipe.cpp → ...ibraries/Source/WWVegas/WWLib/crcpipe.cpp b/...ibraries/Source/WWVegas/WWLib/crcpipe.cpp → ...ibraries/Source/WWVegas/WWLib/crcpipe.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/crcpipe.h → .../Libraries/Source/WWVegas/WWLib/crcpipe.h b/.../Libraries/Source/WWVegas/WWLib/crcpipe.h → .../Libraries/Source/WWVegas/WWLib/crcpipe.h
diff --git a/...braries/Source/WWVegas/WWLib/crcstraw.cpp → ...braries/Source/WWVegas/WWLib/crcstraw.cpp b/...braries/Source/WWVegas/WWLib/crcstraw.cpp → ...braries/Source/WWVegas/WWLib/crcstraw.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/crcstraw.h → ...Libraries/Source/WWVegas/WWLib/crcstraw.h b/...Libraries/Source/WWVegas/WWLib/crcstraw.h → ...Libraries/Source/WWVegas/WWLib/crcstraw.h
diff --git a/...Libraries/Source/WWVegas/WWLib/cstraw.cpp → ...Libraries/Source/WWVegas/WWLib/cstraw.cpp b/...Libraries/Source/WWVegas/WWLib/cstraw.cpp → ...Libraries/Source/WWVegas/WWLib/cstraw.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/cstraw.h → Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/...e/Libraries/Source/WWVegas/WWLib/cstraw.h → Core/Libraries/Source/WWVegas/WWLib/cstraw.h
diff --git a/...braries/Source/WWVegas/WWLib/ffactory.cpp → ...braries/Source/WWVegas/WWLib/ffactory.cpp b/...braries/Source/WWVegas/WWLib/ffactory.cpp → ...braries/Source/WWVegas/WWLib/ffactory.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/ffactory.h → ...Libraries/Source/WWVegas/WWLib/ffactory.h b/...Libraries/Source/WWVegas/WWLib/ffactory.h → ...Libraries/Source/WWVegas/WWLib/ffactory.h
diff --git a/...ibraries/Source/WWVegas/WWLib/gcd_lcm.cpp → ...ibraries/Source/WWVegas/WWLib/gcd_lcm.cpp b/...ibraries/Source/WWVegas/WWLib/gcd_lcm.cpp → ...ibraries/Source/WWVegas/WWLib/gcd_lcm.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/gcd_lcm.h → .../Libraries/Source/WWVegas/WWLib/gcd_lcm.h b/.../Libraries/Source/WWVegas/WWLib/gcd_lcm.h → .../Libraries/Source/WWVegas/WWLib/gcd_lcm.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/global.h → Core/Libraries/Source/WWVegas/WWLib/global.h b/...e/Libraries/Source/WWVegas/WWLib/global.h → Core/Libraries/Source/WWVegas/WWLib/global.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/hash.cpp → Core/Libraries/Source/WWVegas/WWLib/hash.cpp b/...e/Libraries/Source/WWVegas/WWLib/hash.cpp → Core/Libraries/Source/WWVegas/WWLib/hash.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/hash.h → Core/Libraries/Source/WWVegas/WWLib/hash.h b/...ode/Libraries/Source/WWVegas/WWLib/hash.h → Core/Libraries/Source/WWVegas/WWLib/hash.h
diff --git a/...Libraries/Source/WWVegas/WWLib/hashcalc.h → ...Libraries/Source/WWVegas/WWLib/hashcalc.h b/...Libraries/Source/WWVegas/WWLib/hashcalc.h → ...Libraries/Source/WWVegas/WWLib/hashcalc.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/hashtab.h → .../Libraries/Source/WWVegas/WWLib/hashtab.h b/.../Libraries/Source/WWVegas/WWLib/hashtab.h → .../Libraries/Source/WWVegas/WWLib/hashtab.h
diff --git a/...aries/Source/WWVegas/WWLib/hashtemplate.h → ...aries/Source/WWVegas/WWLib/hashtemplate.h b/...aries/Source/WWVegas/WWLib/hashtemplate.h → ...aries/Source/WWVegas/WWLib/hashtemplate.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/incdec.h → Core/Libraries/Source/WWVegas/WWLib/incdec.h b/...e/Libraries/Source/WWVegas/WWLib/incdec.h → Core/Libraries/Source/WWVegas/WWLib/incdec.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/ini.cpp → Core/Libraries/Source/WWVegas/WWLib/ini.cpp b/...de/Libraries/Source/WWVegas/WWLib/ini.cpp → Core/Libraries/Source/WWVegas/WWLib/ini.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/inisup.h → Core/Libraries/Source/WWVegas/WWLib/inisup.h b/...e/Libraries/Source/WWVegas/WWLib/inisup.h → Core/Libraries/Source/WWVegas/WWLib/inisup.h
diff --git a/...Libraries/Source/WWVegas/WWLib/iostruct.h → ...Libraries/Source/WWVegas/WWLib/iostruct.h b/...Libraries/Source/WWVegas/WWLib/iostruct.h → ...Libraries/Source/WWVegas/WWLib/iostruct.h
diff --git a/...Libraries/Source/WWVegas/WWLib/jshell.cpp → ...Libraries/Source/WWVegas/WWLib/jshell.cpp b/...Libraries/Source/WWVegas/WWLib/jshell.cpp → ...Libraries/Source/WWVegas/WWLib/jshell.cpp
diff --git a/...de/Libraries/Source/WWVegas/WWLib/lzo.cpp → Core/Libraries/Source/WWVegas/WWLib/lzo.cpp b/...de/Libraries/Source/WWVegas/WWLib/lzo.cpp → Core/Libraries/Source/WWVegas/WWLib/lzo.cpp
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/lzo.h → Core/Libraries/Source/WWVegas/WWLib/lzo.h b/...Code/Libraries/Source/WWVegas/WWLib/lzo.h → Core/Libraries/Source/WWVegas/WWLib/lzo.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/lzo1x.h → Core/Libraries/Source/WWVegas/WWLib/lzo1x.h b/...de/Libraries/Source/WWVegas/WWLib/lzo1x.h → Core/Libraries/Source/WWVegas/WWLib/lzo1x.h
diff --git a/...ibraries/Source/WWVegas/WWLib/lzo1x_c.cpp → ...ibraries/Source/WWVegas/WWLib/lzo1x_c.cpp b/...ibraries/Source/WWVegas/WWLib/lzo1x_c.cpp → ...ibraries/Source/WWVegas/WWLib/lzo1x_c.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/lzo1x_d.cpp → ...ibraries/Source/WWVegas/WWLib/lzo1x_d.cpp b/...ibraries/Source/WWVegas/WWLib/lzo1x_d.cpp → ...ibraries/Source/WWVegas/WWLib/lzo1x_d.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/lzo_conf.h → ...Libraries/Source/WWVegas/WWLib/lzo_conf.h b/...Libraries/Source/WWVegas/WWLib/lzo_conf.h → ...Libraries/Source/WWVegas/WWLib/lzo_conf.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/lzoconf.h → .../Libraries/Source/WWVegas/WWLib/lzoconf.h b/.../Libraries/Source/WWVegas/WWLib/lzoconf.h → .../Libraries/Source/WWVegas/WWLib/lzoconf.h
diff --git a/...ibraries/Source/WWVegas/WWLib/lzopipe.cpp → ...ibraries/Source/WWVegas/WWLib/lzopipe.cpp b/...ibraries/Source/WWVegas/WWLib/lzopipe.cpp → ...ibraries/Source/WWVegas/WWLib/lzopipe.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/lzopipe.h → .../Libraries/Source/WWVegas/WWLib/lzopipe.h b/.../Libraries/Source/WWVegas/WWLib/lzopipe.h → .../Libraries/Source/WWVegas/WWLib/lzopipe.h
diff --git a/...braries/Source/WWVegas/WWLib/lzostraw.cpp → ...braries/Source/WWVegas/WWLib/lzostraw.cpp b/...braries/Source/WWVegas/WWLib/lzostraw.cpp → ...braries/Source/WWVegas/WWLib/lzostraw.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/lzostraw.h → ...Libraries/Source/WWVegas/WWLib/lzostraw.h b/...Libraries/Source/WWVegas/WWLib/lzostraw.h → ...Libraries/Source/WWVegas/WWLib/lzostraw.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/md5.cpp → Core/Libraries/Source/WWVegas/WWLib/md5.cpp b/...de/Libraries/Source/WWVegas/WWLib/md5.cpp → Core/Libraries/Source/WWVegas/WWLib/md5.cpp
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/md5.h → Core/Libraries/Source/WWVegas/WWLib/md5.h b/...Code/Libraries/Source/WWVegas/WWLib/md5.h → Core/Libraries/Source/WWVegas/WWLib/md5.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/mempool.h → .../Libraries/Source/WWVegas/WWLib/mempool.h b/.../Libraries/Source/WWVegas/WWLib/mempool.h → .../Libraries/Source/WWVegas/WWLib/mempool.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/mmsys.h → Core/Libraries/Source/WWVegas/WWLib/mmsys.h b/...de/Libraries/Source/WWVegas/WWLib/mmsys.h → Core/Libraries/Source/WWVegas/WWLib/mmsys.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/mpu.cpp → Core/Libraries/Source/WWVegas/WWLib/mpu.cpp b/...de/Libraries/Source/WWVegas/WWLib/mpu.cpp → Core/Libraries/Source/WWVegas/WWLib/mpu.cpp
diff --git a/...raries/Source/WWVegas/WWLib/multilist.cpp → ...raries/Source/WWVegas/WWLib/multilist.cpp b/...raries/Source/WWVegas/WWLib/multilist.cpp → ...raries/Source/WWVegas/WWLib/multilist.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/multilist.h → ...ibraries/Source/WWVegas/WWLib/multilist.h b/...ibraries/Source/WWVegas/WWLib/multilist.h → ...ibraries/Source/WWVegas/WWLib/multilist.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/mutex.cpp → .../Libraries/Source/WWVegas/WWLib/mutex.cpp b/.../Libraries/Source/WWVegas/WWLib/mutex.cpp → .../Libraries/Source/WWVegas/WWLib/mutex.cpp
diff --git a/...de/Libraries/Source/WWVegas/WWLib/mutex.h → Core/Libraries/Source/WWVegas/WWLib/mutex.h b/...de/Libraries/Source/WWVegas/WWLib/mutex.h → Core/Libraries/Source/WWVegas/WWLib/mutex.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/noinit.h → Core/Libraries/Source/WWVegas/WWLib/noinit.h b/...e/Libraries/Source/WWVegas/WWLib/noinit.h → Core/Libraries/Source/WWVegas/WWLib/noinit.h
diff --git a/...Libraries/Source/WWVegas/WWLib/notifier.h → ...Libraries/Source/WWVegas/WWLib/notifier.h b/...Libraries/Source/WWVegas/WWLib/notifier.h → ...Libraries/Source/WWVegas/WWLib/notifier.h
diff --git a/...ibraries/Source/WWVegas/WWLib/nstrdup.cpp → ...ibraries/Source/WWVegas/WWLib/nstrdup.cpp b/...ibraries/Source/WWVegas/WWLib/nstrdup.cpp → ...ibraries/Source/WWVegas/WWLib/nstrdup.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/nstrdup.h → .../Libraries/Source/WWVegas/WWLib/nstrdup.h b/.../Libraries/Source/WWVegas/WWLib/nstrdup.h → .../Libraries/Source/WWVegas/WWLib/nstrdup.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/ntree.h → Core/Libraries/Source/WWVegas/WWLib/ntree.h b/...de/Libraries/Source/WWVegas/WWLib/ntree.h → Core/Libraries/Source/WWVegas/WWLib/ntree.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/pipe.cpp → Core/Libraries/Source/WWVegas/WWLib/pipe.cpp b/...e/Libraries/Source/WWVegas/WWLib/pipe.cpp → Core/Libraries/Source/WWVegas/WWLib/pipe.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/ramfile.cpp → ...ibraries/Source/WWVegas/WWLib/ramfile.cpp b/...ibraries/Source/WWVegas/WWLib/ramfile.cpp → ...ibraries/Source/WWVegas/WWLib/ramfile.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/random.cpp → ...Libraries/Source/WWVegas/WWLib/random.cpp b/...Libraries/Source/WWVegas/WWLib/random.cpp → ...Libraries/Source/WWVegas/WWLib/random.cpp
diff --git a/...ibraries/Source/WWVegas/WWLib/rawfile.cpp → ...ibraries/Source/WWVegas/WWLib/rawfile.cpp b/...ibraries/Source/WWVegas/WWLib/rawfile.cpp → ...ibraries/Source/WWVegas/WWLib/rawfile.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/rcfile.cpp → ...Libraries/Source/WWVegas/WWLib/rcfile.cpp b/...Libraries/Source/WWVegas/WWLib/rcfile.cpp → ...Libraries/Source/WWVegas/WWLib/rcfile.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/rcfile.h → Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/...e/Libraries/Source/WWVegas/WWLib/rcfile.h → Core/Libraries/Source/WWVegas/WWLib/rcfile.h
diff --git a/...braries/Source/WWVegas/WWLib/readline.cpp → ...braries/Source/WWVegas/WWLib/readline.cpp b/...braries/Source/WWVegas/WWLib/readline.cpp → ...braries/Source/WWVegas/WWLib/readline.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/readline.h → ...Libraries/Source/WWVegas/WWLib/readline.h b/...Libraries/Source/WWVegas/WWLib/readline.h → ...Libraries/Source/WWVegas/WWLib/readline.h
diff --git a/...ibraries/Source/WWVegas/WWLib/realcrc.cpp → ...ibraries/Source/WWVegas/WWLib/realcrc.cpp b/...ibraries/Source/WWVegas/WWLib/realcrc.cpp → ...ibraries/Source/WWVegas/WWLib/realcrc.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/realcrc.h → .../Libraries/Source/WWVegas/WWLib/realcrc.h b/.../Libraries/Source/WWVegas/WWLib/realcrc.h → .../Libraries/Source/WWVegas/WWLib/realcrc.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/ref_ptr.h → .../Libraries/Source/WWVegas/WWLib/ref_ptr.h b/.../Libraries/Source/WWVegas/WWLib/ref_ptr.h → .../Libraries/Source/WWVegas/WWLib/ref_ptr.h
diff --git a/...braries/Source/WWVegas/WWLib/refcount.cpp → ...braries/Source/WWVegas/WWLib/refcount.cpp b/...braries/Source/WWVegas/WWLib/refcount.cpp → ...braries/Source/WWVegas/WWLib/refcount.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/refcount.h → ...Libraries/Source/WWVegas/WWLib/refcount.h b/...Libraries/Source/WWVegas/WWLib/refcount.h → ...Libraries/Source/WWVegas/WWLib/refcount.h
diff --git a/...ibraries/Source/WWVegas/WWLib/regexpr.cpp → ...ibraries/Source/WWVegas/WWLib/regexpr.cpp b/...ibraries/Source/WWVegas/WWLib/regexpr.cpp → ...ibraries/Source/WWVegas/WWLib/regexpr.cpp
diff --git a/.../Libraries/Source/WWVegas/WWLib/regexpr.h → .../Libraries/Source/WWVegas/WWLib/regexpr.h b/.../Libraries/Source/WWVegas/WWLib/regexpr.h → .../Libraries/Source/WWVegas/WWLib/regexpr.h
diff --git a/...braries/Source/WWVegas/WWLib/registry.cpp → ...braries/Source/WWVegas/WWLib/registry.cpp b/...braries/Source/WWVegas/WWLib/registry.cpp → ...braries/Source/WWVegas/WWLib/registry.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/registry.h → ...Libraries/Source/WWVegas/WWLib/registry.h b/...Libraries/Source/WWVegas/WWLib/registry.h → ...Libraries/Source/WWVegas/WWLib/registry.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/search.h → Core/Libraries/Source/WWVegas/WWLib/search.h b/...e/Libraries/Source/WWVegas/WWLib/search.h → Core/Libraries/Source/WWVegas/WWLib/search.h
diff --git a/...Libraries/Source/WWVegas/WWLib/sharebuf.h → ...Libraries/Source/WWVegas/WWLib/sharebuf.h b/...Libraries/Source/WWVegas/WWLib/sharebuf.h → ...Libraries/Source/WWVegas/WWLib/sharebuf.h
diff --git a/...ibraries/Source/WWVegas/WWLib/simplevec.h → ...ibraries/Source/WWVegas/WWLib/simplevec.h b/...ibraries/Source/WWVegas/WWLib/simplevec.h → ...ibraries/Source/WWVegas/WWLib/simplevec.h
diff --git a/...Libraries/Source/WWVegas/WWLib/slnode.cpp → ...Libraries/Source/WWVegas/WWLib/slnode.cpp b/...Libraries/Source/WWVegas/WWLib/slnode.cpp → ...Libraries/Source/WWVegas/WWLib/slnode.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/stimer.cpp → ...Libraries/Source/WWVegas/WWLib/stimer.cpp b/...Libraries/Source/WWVegas/WWLib/stimer.cpp → ...Libraries/Source/WWVegas/WWLib/stimer.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/stimer.h → Core/Libraries/Source/WWVegas/WWLib/stimer.h b/...e/Libraries/Source/WWVegas/WWLib/stimer.h → Core/Libraries/Source/WWVegas/WWLib/stimer.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/straw.cpp → .../Libraries/Source/WWVegas/WWLib/straw.cpp b/.../Libraries/Source/WWVegas/WWLib/straw.cpp → .../Libraries/Source/WWVegas/WWLib/straw.cpp
diff --git a/...braries/Source/WWVegas/WWLib/strtok_r.cpp → ...braries/Source/WWVegas/WWLib/strtok_r.cpp b/...braries/Source/WWVegas/WWLib/strtok_r.cpp → ...braries/Source/WWVegas/WWLib/strtok_r.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/strtok_r.h → ...Libraries/Source/WWVegas/WWLib/strtok_r.h b/...Libraries/Source/WWVegas/WWLib/strtok_r.h → ...Libraries/Source/WWVegas/WWLib/strtok_r.h
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/swap.h → Core/Libraries/Source/WWVegas/WWLib/swap.h b/...ode/Libraries/Source/WWVegas/WWLib/swap.h → Core/Libraries/Source/WWVegas/WWLib/swap.h
diff --git a/...braries/Source/WWVegas/WWLib/systimer.cpp → ...braries/Source/WWVegas/WWLib/systimer.cpp b/...braries/Source/WWVegas/WWLib/systimer.cpp → ...braries/Source/WWVegas/WWLib/systimer.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/systimer.h → ...Libraries/Source/WWVegas/WWLib/systimer.h b/...Libraries/Source/WWVegas/WWLib/systimer.h → ...Libraries/Source/WWVegas/WWLib/systimer.h
diff --git a/...braries/Source/WWVegas/WWLib/textfile.cpp → ...braries/Source/WWVegas/WWLib/textfile.cpp b/...braries/Source/WWVegas/WWLib/textfile.cpp → ...braries/Source/WWVegas/WWLib/textfile.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/textfile.h → ...Libraries/Source/WWVegas/WWLib/textfile.h b/...Libraries/Source/WWVegas/WWLib/textfile.h → ...Libraries/Source/WWVegas/WWLib/textfile.h
diff --git a/...braries/Source/WWVegas/WWLib/tgatodxt.cpp → ...braries/Source/WWVegas/WWLib/tgatodxt.cpp b/...braries/Source/WWVegas/WWLib/tgatodxt.cpp → ...braries/Source/WWVegas/WWLib/tgatodxt.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/tgatodxt.h → ...Libraries/Source/WWVegas/WWLib/tgatodxt.h b/...Libraries/Source/WWVegas/WWLib/tgatodxt.h → ...Libraries/Source/WWVegas/WWLib/tgatodxt.h
diff --git a/...Libraries/Source/WWVegas/WWLib/thread.cpp → ...Libraries/Source/WWVegas/WWLib/thread.cpp b/...Libraries/Source/WWVegas/WWLib/thread.cpp → ...Libraries/Source/WWVegas/WWLib/thread.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/thread.h → Core/Libraries/Source/WWVegas/WWLib/thread.h b/...e/Libraries/Source/WWVegas/WWLib/thread.h → Core/Libraries/Source/WWVegas/WWLib/thread.h
diff --git a/...de/Libraries/Source/WWVegas/WWLib/trect.h → Core/Libraries/Source/WWVegas/WWLib/trect.h b/...de/Libraries/Source/WWVegas/WWLib/trect.h → Core/Libraries/Source/WWVegas/WWLib/trect.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/trim.cpp → Core/Libraries/Source/WWVegas/WWLib/trim.cpp b/...e/Libraries/Source/WWVegas/WWLib/trim.cpp → Core/Libraries/Source/WWVegas/WWLib/trim.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWLib/trim.h → Core/Libraries/Source/WWVegas/WWLib/trim.h b/...ode/Libraries/Source/WWVegas/WWLib/trim.h → Core/Libraries/Source/WWVegas/WWLib/trim.h
diff --git a/...e/Libraries/Source/WWVegas/WWLib/uarray.h → Core/Libraries/Source/WWVegas/WWLib/uarray.h b/...e/Libraries/Source/WWVegas/WWLib/uarray.h → Core/Libraries/Source/WWVegas/WWLib/uarray.h
diff --git a/...Libraries/Source/WWVegas/WWLib/vector.cpp → ...Libraries/Source/WWVegas/WWLib/vector.cpp b/...Libraries/Source/WWVegas/WWLib/vector.cpp → ...Libraries/Source/WWVegas/WWLib/vector.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/verchk.cpp → ...Libraries/Source/WWVegas/WWLib/verchk.cpp b/...Libraries/Source/WWVegas/WWLib/verchk.cpp → ...Libraries/Source/WWVegas/WWLib/verchk.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWLib/verchk.h → Core/Libraries/Source/WWVegas/WWLib/verchk.h b/...e/Libraries/Source/WWVegas/WWLib/verchk.h → Core/Libraries/Source/WWVegas/WWLib/verchk.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/visualc.h → .../Libraries/Source/WWVegas/WWLib/visualc.h b/.../Libraries/Source/WWVegas/WWLib/visualc.h → .../Libraries/Source/WWVegas/WWLib/visualc.h
diff --git a/...aries/Source/WWVegas/WWLib/widestring.cpp → ...aries/Source/WWVegas/WWLib/widestring.cpp b/...aries/Source/WWVegas/WWLib/widestring.cpp → ...aries/Source/WWVegas/WWLib/widestring.cpp
diff --git a/...braries/Source/WWVegas/WWLib/widestring.h → ...braries/Source/WWVegas/WWLib/widestring.h b/...braries/Source/WWVegas/WWLib/widestring.h → ...braries/Source/WWVegas/WWLib/widestring.h
diff --git a/...Code/Libraries/Source/WWVegas/WWLib/win.h → Core/Libraries/Source/WWVegas/WWLib/win.h b/...Code/Libraries/Source/WWVegas/WWLib/win.h → Core/Libraries/Source/WWVegas/WWLib/win.h
diff --git a/...Libraries/Source/WWVegas/WWLib/wwfile.cpp → ...Libraries/Source/WWVegas/WWLib/wwfile.cpp b/...Libraries/Source/WWVegas/WWLib/wwfile.cpp → ...Libraries/Source/WWVegas/WWLib/wwfile.cpp
diff --git a/...braries/Source/WWVegas/WWLib/wwstring.cpp → ...braries/Source/WWVegas/WWLib/wwstring.cpp b/...braries/Source/WWVegas/WWLib/wwstring.cpp → ...braries/Source/WWVegas/WWLib/wwstring.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/wwstring.h → ...Libraries/Source/WWVegas/WWLib/wwstring.h b/...Libraries/Source/WWVegas/WWLib/wwstring.h → ...Libraries/Source/WWVegas/WWLib/wwstring.h
diff --git a/.../Libraries/Source/WWVegas/WWLib/xpipe.cpp → .../Libraries/Source/WWVegas/WWLib/xpipe.cpp b/.../Libraries/Source/WWVegas/WWLib/xpipe.cpp → .../Libraries/Source/WWVegas/WWLib/xpipe.cpp
diff --git a/...Libraries/Source/WWVegas/WWLib/xstraw.cpp → ...Libraries/Source/WWVegas/WWLib/xstraw.cpp b/...Libraries/Source/WWVegas/WWLib/xstraw.cpp → ...Libraries/Source/WWVegas/WWLib/xstraw.cpp
diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(gi_gameenginedevice_include INTERFACE)
 add_library(gi_libraries_include INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
 add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwdebug INTERFACE)
-add_library(gi_libraries_source_wwvegas_wwlib INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwmath INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwsaveload INTERFACE)
 add_library(gi_main INTERFACE)
@@ -18,8 +16,6 @@ target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevi
 target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
 target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
-target_include_directories(gi_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
-target_include_directories(gi_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
 target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
 target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")

diff --git a/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt
@@ -5,6 +5,7 @@ target_link_libraries(g_wwcommon INTERFACE
     d3d8lib
     core_config
     core_utility
+    core_wwcommon
     milesstub
     stlport
 )
@@ -13,15 +14,11 @@ target_include_directories(g_wwcommon INTERFACE
     .
     WW3D2
     WWAudio
-    WWDebug
-    WWLib
     WWMath
     WWSaveLoad
     Wwutil
 )
 
-add_subdirectory(WWDebug)
-add_subdirectory(WWLib)
 add_subdirectory(WWMath)
 add_subdirectory(Wwutil)
 add_subdirectory(WWSaveLoad)
@@ -34,19 +31,16 @@ add_library(g_wwvegas INTERFACE)
 target_include_directories(g_wwvegas INTERFACE
     .
     WW3D2
-    WWDebug
     WWDownload
-    WWLib
     WWMath
     WWSaveLoad
     Wwutil
 )
 
 target_link_libraries(g_wwvegas INTERFACE
+    core_wwvegas    
     g_ww3d2
-    g_wwdebug
     g_wwdownload
-    g_wwlib
     g_wwmath
     g_wwsaveload
     g_wwutil

diff --git a/Generals/Code/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWDebug/CMakeLists.txt