TheSuperHackers · feliwir · Apr 14, 2025
diff --git a/Core/Libraries/Source/WWVegas/CMakeLists.txt b/Core/Libraries/Source/WWVegas/CMakeLists.txt
@@ -18,14 +18,16 @@ target_include_directories(core_wwcommon INTERFACE
     .
     WWDebug
     WWLib
+    WWMath
+    WWSaveLoad
 )
 
 # add_subdirectory(WWAudio)
 add_subdirectory(WWDebug)
 add_subdirectory(WWLib)
-# add_subdirectory(WWMath)
+add_subdirectory(WWMath)
 # add_subdirectory(Wwutil)
-# add_subdirectory(WWSaveLoad)
+add_subdirectory(WWSaveLoad)
 add_subdirectory(WWStub)
 # add_subdirectory(WW3D2)
 # add_subdirectory(WWDownload)
@@ -40,8 +42,8 @@ target_include_directories(core_wwvegas INTERFACE
     WWDebug
     #WWDownload
     WWLib
-    #WWMath
-    #WWSaveLoad
+    WWMath
+    WWSaveLoad
     #Wwutil
     #wwshade
 )
@@ -51,8 +53,8 @@ target_link_libraries(core_wwvegas INTERFACE
     core_wwdebug
     # core_wwdownload
     core_wwlib
-    # core_wwmath
-    # core_wwsaveload
+    core_wwmath
+    core_wwsaveload
     # core_wwshade
     # core_wwutil
 )
diff --git a/...ries/Source/WWVegas/WWMath/CMakeLists.txt → ...ries/Source/WWVegas/WWMath/CMakeLists.txt b/...ries/Source/WWVegas/WWMath/CMakeLists.txt → ...ries/Source/WWVegas/WWMath/CMakeLists.txt
@@ -81,14 +81,14 @@ set(WWMATH_SRC
 )
 
 # Targets to build.
-add_library(z_wwmath STATIC)
-set_target_properties(z_wwmath PROPERTIES OUTPUT_NAME wwmath)
+add_library(core_wwmath STATIC)
+set_target_properties(core_wwmath PROPERTIES OUTPUT_NAME wwmath)
 
-target_sources(z_wwmath PRIVATE ${WWMATH_SRC})
+target_sources(core_wwmath PRIVATE ${WWMATH_SRC})
 
-target_link_libraries(z_wwmath PRIVATE
-    z_wwcommon
+target_link_libraries(core_wwmath PRIVATE
+    core_wwcommon
 )
 
 # @todo Test its impact and see what to do with the legacy functions.
-#add_compile_definitions(z_wwmath PUBLIC ALLOW_TEMPORARIES) # Enables legacy math with "temporaries"
+#add_compile_definitions(core_wwmath PUBLIC ALLOW_TEMPORARIES) # Enables legacy math with "temporaries"
diff --git a/...ibraries/Source/WWVegas/WWMath/Vector3i.h → ...ibraries/Source/WWVegas/WWMath/Vector3i.h b/...ibraries/Source/WWVegas/WWMath/Vector3i.h → ...ibraries/Source/WWVegas/WWMath/Vector3i.h
diff --git a/...Libraries/Source/WWVegas/WWMath/aabox.cpp → ...Libraries/Source/WWVegas/WWMath/aabox.cpp b/...Libraries/Source/WWVegas/WWMath/aabox.cpp → ...Libraries/Source/WWVegas/WWMath/aabox.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWMath/aabox.h → Core/Libraries/Source/WWVegas/WWMath/aabox.h b/...e/Libraries/Source/WWVegas/WWMath/aabox.h → Core/Libraries/Source/WWVegas/WWMath/aabox.h
diff --git a/...ies/Source/WWVegas/WWMath/aabtreecull.cpp → ...ies/Source/WWVegas/WWMath/aabtreecull.cpp b/...ies/Source/WWVegas/WWMath/aabtreecull.cpp → ...ies/Source/WWVegas/WWMath/aabtreecull.cpp
diff --git a/...aries/Source/WWVegas/WWMath/aabtreecull.h → ...aries/Source/WWVegas/WWMath/aabtreecull.h b/...aries/Source/WWVegas/WWMath/aabtreecull.h → ...aries/Source/WWVegas/WWMath/aabtreecull.h
diff --git a/...Libraries/Source/WWVegas/WWMath/aaplane.h → ...Libraries/Source/WWVegas/WWMath/aaplane.h b/...Libraries/Source/WWVegas/WWMath/aaplane.h → ...Libraries/Source/WWVegas/WWMath/aaplane.h
diff --git a/.../Source/WWVegas/WWMath/cardinalspline.cpp → .../Source/WWVegas/WWMath/cardinalspline.cpp b/.../Source/WWVegas/WWMath/cardinalspline.cpp → .../Source/WWVegas/WWMath/cardinalspline.cpp
diff --git a/...es/Source/WWVegas/WWMath/cardinalspline.h → ...es/Source/WWVegas/WWMath/cardinalspline.h b/...es/Source/WWVegas/WWMath/cardinalspline.h → ...es/Source/WWVegas/WWMath/cardinalspline.h
diff --git a/...Libraries/Source/WWVegas/WWMath/castres.h → ...Libraries/Source/WWVegas/WWMath/castres.h b/...Libraries/Source/WWVegas/WWMath/castres.h → ...Libraries/Source/WWVegas/WWMath/castres.h
diff --git a/...ource/WWVegas/WWMath/catmullromspline.cpp → ...ource/WWVegas/WWMath/catmullromspline.cpp b/...ource/WWVegas/WWMath/catmullromspline.cpp → ...ource/WWVegas/WWMath/catmullromspline.cpp
diff --git a/.../Source/WWVegas/WWMath/catmullromspline.h → .../Source/WWVegas/WWMath/catmullromspline.h b/.../Source/WWVegas/WWMath/catmullromspline.h → .../Source/WWVegas/WWMath/catmullromspline.h
diff --git a/...braries/Source/WWVegas/WWMath/colmath.cpp → ...braries/Source/WWVegas/WWMath/colmath.cpp b/...braries/Source/WWVegas/WWMath/colmath.cpp → ...braries/Source/WWVegas/WWMath/colmath.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/colmath.h → ...Libraries/Source/WWVegas/WWMath/colmath.h b/...Libraries/Source/WWVegas/WWMath/colmath.h → ...Libraries/Source/WWVegas/WWMath/colmath.h
diff --git a/...es/Source/WWVegas/WWMath/colmathaabox.cpp → ...es/Source/WWVegas/WWMath/colmathaabox.cpp b/...es/Source/WWVegas/WWMath/colmathaabox.cpp → ...es/Source/WWVegas/WWMath/colmathaabox.cpp
diff --git a/...ries/Source/WWVegas/WWMath/colmathaabox.h → ...ries/Source/WWVegas/WWMath/colmathaabox.h b/...ries/Source/WWVegas/WWMath/colmathaabox.h → ...ries/Source/WWVegas/WWMath/colmathaabox.h
diff --git a/...s/Source/WWVegas/WWMath/colmathaabtri.cpp → ...s/Source/WWVegas/WWMath/colmathaabtri.cpp b/...s/Source/WWVegas/WWMath/colmathaabtri.cpp → ...s/Source/WWVegas/WWMath/colmathaabtri.cpp
diff --git a/.../Source/WWVegas/WWMath/colmathfrustum.cpp → .../Source/WWVegas/WWMath/colmathfrustum.cpp b/.../Source/WWVegas/WWMath/colmathfrustum.cpp → .../Source/WWVegas/WWMath/colmathfrustum.cpp
diff --git a/...es/Source/WWVegas/WWMath/colmathfrustum.h → ...es/Source/WWVegas/WWMath/colmathfrustum.h b/...es/Source/WWVegas/WWMath/colmathfrustum.h → ...es/Source/WWVegas/WWMath/colmathfrustum.h
diff --git a/...es/Source/WWVegas/WWMath/colmathinlines.h → ...es/Source/WWVegas/WWMath/colmathinlines.h b/...es/Source/WWVegas/WWMath/colmathinlines.h → ...es/Source/WWVegas/WWMath/colmathinlines.h
diff --git a/...ies/Source/WWVegas/WWMath/colmathline.cpp → ...ies/Source/WWVegas/WWMath/colmathline.cpp b/...ies/Source/WWVegas/WWMath/colmathline.cpp → ...ies/Source/WWVegas/WWMath/colmathline.cpp
diff --git a/...aries/Source/WWVegas/WWMath/colmathline.h → ...aries/Source/WWVegas/WWMath/colmathline.h b/...aries/Source/WWVegas/WWMath/colmathline.h → ...aries/Source/WWVegas/WWMath/colmathline.h
diff --git a/...s/Source/WWVegas/WWMath/colmathobbobb.cpp → ...s/Source/WWVegas/WWMath/colmathobbobb.cpp b/...s/Source/WWVegas/WWMath/colmathobbobb.cpp → ...s/Source/WWVegas/WWMath/colmathobbobb.cpp
diff --git a/...es/Source/WWVegas/WWMath/colmathobbox.cpp → ...es/Source/WWVegas/WWMath/colmathobbox.cpp b/...es/Source/WWVegas/WWMath/colmathobbox.cpp → ...es/Source/WWVegas/WWMath/colmathobbox.cpp
diff --git a/...s/Source/WWVegas/WWMath/colmathobbtri.cpp → ...s/Source/WWVegas/WWMath/colmathobbtri.cpp b/...s/Source/WWVegas/WWMath/colmathobbtri.cpp → ...s/Source/WWVegas/WWMath/colmathobbtri.cpp
diff --git a/...es/Source/WWVegas/WWMath/colmathplane.cpp → ...es/Source/WWVegas/WWMath/colmathplane.cpp b/...es/Source/WWVegas/WWMath/colmathplane.cpp → ...es/Source/WWVegas/WWMath/colmathplane.cpp
diff --git a/...ries/Source/WWVegas/WWMath/colmathplane.h → ...ries/Source/WWVegas/WWMath/colmathplane.h b/...ries/Source/WWVegas/WWMath/colmathplane.h → ...ries/Source/WWVegas/WWMath/colmathplane.h
diff --git a/...s/Source/WWVegas/WWMath/colmathsphere.cpp → ...s/Source/WWVegas/WWMath/colmathsphere.cpp b/...s/Source/WWVegas/WWMath/colmathsphere.cpp → ...s/Source/WWVegas/WWMath/colmathsphere.cpp
diff --git a/...braries/Source/WWVegas/WWMath/cullsys.cpp → ...braries/Source/WWVegas/WWMath/cullsys.cpp b/...braries/Source/WWVegas/WWMath/cullsys.cpp → ...braries/Source/WWVegas/WWMath/cullsys.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/cullsys.h → ...Libraries/Source/WWVegas/WWMath/cullsys.h b/...Libraries/Source/WWVegas/WWMath/cullsys.h → ...Libraries/Source/WWVegas/WWMath/cullsys.h
diff --git a/...ibraries/Source/WWVegas/WWMath/culltype.h → ...ibraries/Source/WWVegas/WWMath/culltype.h b/...ibraries/Source/WWVegas/WWMath/culltype.h → ...ibraries/Source/WWVegas/WWMath/culltype.h
diff --git a/...Libraries/Source/WWVegas/WWMath/curve.cpp → ...Libraries/Source/WWVegas/WWMath/curve.cpp b/...Libraries/Source/WWVegas/WWMath/curve.cpp → ...Libraries/Source/WWVegas/WWMath/curve.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWMath/curve.h → Core/Libraries/Source/WWVegas/WWMath/curve.h b/...e/Libraries/Source/WWVegas/WWMath/curve.h → Core/Libraries/Source/WWVegas/WWMath/curve.h
diff --git a/...Libraries/Source/WWVegas/WWMath/euler.cpp → ...Libraries/Source/WWVegas/WWMath/euler.cpp b/...Libraries/Source/WWVegas/WWMath/euler.cpp → ...Libraries/Source/WWVegas/WWMath/euler.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWMath/euler.h → Core/Libraries/Source/WWVegas/WWMath/euler.h b/...e/Libraries/Source/WWVegas/WWMath/euler.h → Core/Libraries/Source/WWVegas/WWMath/euler.h
diff --git a/...braries/Source/WWVegas/WWMath/frustum.cpp → ...braries/Source/WWVegas/WWMath/frustum.cpp b/...braries/Source/WWVegas/WWMath/frustum.cpp → ...braries/Source/WWVegas/WWMath/frustum.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/frustum.h → ...Libraries/Source/WWVegas/WWMath/frustum.h b/...Libraries/Source/WWVegas/WWMath/frustum.h → ...Libraries/Source/WWVegas/WWMath/frustum.h
diff --git a/...raries/Source/WWVegas/WWMath/gridcull.cpp → ...raries/Source/WWVegas/WWMath/gridcull.cpp b/...raries/Source/WWVegas/WWMath/gridcull.cpp → ...raries/Source/WWVegas/WWMath/gridcull.cpp
diff --git a/...ibraries/Source/WWVegas/WWMath/gridcull.h → ...ibraries/Source/WWVegas/WWMath/gridcull.h b/...ibraries/Source/WWVegas/WWMath/gridcull.h → ...ibraries/Source/WWVegas/WWMath/gridcull.h
diff --git a/...s/Source/WWVegas/WWMath/hermitespline.cpp → ...s/Source/WWVegas/WWMath/hermitespline.cpp b/...s/Source/WWVegas/WWMath/hermitespline.cpp → ...s/Source/WWVegas/WWMath/hermitespline.cpp
diff --git a/...ies/Source/WWVegas/WWMath/hermitespline.h → ...ies/Source/WWVegas/WWMath/hermitespline.h b/...ies/Source/WWVegas/WWMath/hermitespline.h → ...ies/Source/WWVegas/WWMath/hermitespline.h
diff --git a/...braries/Source/WWVegas/WWMath/lineseg.cpp → ...braries/Source/WWVegas/WWMath/lineseg.cpp b/...braries/Source/WWVegas/WWMath/lineseg.cpp → ...braries/Source/WWVegas/WWMath/lineseg.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/lineseg.h → ...Libraries/Source/WWVegas/WWMath/lineseg.h b/...Libraries/Source/WWVegas/WWMath/lineseg.h → ...Libraries/Source/WWVegas/WWMath/lineseg.h
diff --git a/...ies/Source/WWVegas/WWMath/lookuptable.cpp → ...ies/Source/WWVegas/WWMath/lookuptable.cpp b/...ies/Source/WWVegas/WWMath/lookuptable.cpp → ...ies/Source/WWVegas/WWMath/lookuptable.cpp
diff --git a/...aries/Source/WWVegas/WWMath/lookuptable.h → ...aries/Source/WWVegas/WWMath/lookuptable.h b/...aries/Source/WWVegas/WWMath/lookuptable.h → ...aries/Source/WWVegas/WWMath/lookuptable.h
diff --git a/...braries/Source/WWVegas/WWMath/matrix3.cpp → ...braries/Source/WWVegas/WWMath/matrix3.cpp b/...braries/Source/WWVegas/WWMath/matrix3.cpp → ...braries/Source/WWVegas/WWMath/matrix3.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/matrix3.h → ...Libraries/Source/WWVegas/WWMath/matrix3.h b/...Libraries/Source/WWVegas/WWMath/matrix3.h → ...Libraries/Source/WWVegas/WWMath/matrix3.h
diff --git a/...raries/Source/WWVegas/WWMath/matrix3d.cpp → ...raries/Source/WWVegas/WWMath/matrix3d.cpp b/...raries/Source/WWVegas/WWMath/matrix3d.cpp → ...raries/Source/WWVegas/WWMath/matrix3d.cpp
diff --git a/...ibraries/Source/WWVegas/WWMath/matrix3d.h → ...ibraries/Source/WWVegas/WWMath/matrix3d.h b/...ibraries/Source/WWVegas/WWMath/matrix3d.h → ...ibraries/Source/WWVegas/WWMath/matrix3d.h
diff --git a/...braries/Source/WWVegas/WWMath/matrix4.cpp → ...braries/Source/WWVegas/WWMath/matrix4.cpp b/...braries/Source/WWVegas/WWMath/matrix4.cpp → ...braries/Source/WWVegas/WWMath/matrix4.cpp
diff --git a/...Libraries/Source/WWVegas/WWMath/matrix4.h → ...Libraries/Source/WWVegas/WWMath/matrix4.h b/...Libraries/Source/WWVegas/WWMath/matrix4.h → ...Libraries/Source/WWVegas/WWMath/matrix4.h
diff --git a/...raries/Source/WWVegas/WWMath/normalcone.h → ...raries/Source/WWVegas/WWMath/normalcone.h b/...raries/Source/WWVegas/WWMath/normalcone.h → ...raries/Source/WWVegas/WWMath/normalcone.h
diff --git a/...Libraries/Source/WWVegas/WWMath/obbox.cpp → ...Libraries/Source/WWVegas/WWMath/obbox.cpp b/...Libraries/Source/WWVegas/WWMath/obbox.cpp → ...Libraries/Source/WWVegas/WWMath/obbox.cpp
diff --git a/...e/Libraries/Source/WWVegas/WWMath/obbox.h → Core/Libraries/Source/WWVegas/WWMath/obbox.h b/...e/Libraries/Source/WWVegas/WWMath/obbox.h → Core/Libraries/Source/WWVegas/WWMath/obbox.h
diff --git a/...e/Libraries/Source/WWVegas/WWMath/ode.cpp → Core/Libraries/Source/WWVegas/WWMath/ode.cpp b/...e/Libraries/Source/WWVegas/WWMath/ode.cpp → Core/Libraries/Source/WWVegas/WWMath/ode.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWMath/ode.h → Core/Libraries/Source/WWVegas/WWMath/ode.h b/...ode/Libraries/Source/WWVegas/WWMath/ode.h → Core/Libraries/Source/WWVegas/WWMath/ode.h
diff --git a/...e/Libraries/Source/WWVegas/WWMath/plane.h → Core/Libraries/Source/WWVegas/WWMath/plane.h b/...e/Libraries/Source/WWVegas/WWMath/plane.h → Core/Libraries/Source/WWVegas/WWMath/plane.h
diff --git a/...e/Libraries/Source/WWVegas/WWMath/pot.cpp → Core/Libraries/Source/WWVegas/WWMath/pot.cpp b/...e/Libraries/Source/WWVegas/WWMath/pot.cpp → Core/Libraries/Source/WWVegas/WWMath/pot.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWMath/pot.h → Core/Libraries/Source/WWVegas/WWMath/pot.h b/...ode/Libraries/Source/WWVegas/WWMath/pot.h → Core/Libraries/Source/WWVegas/WWMath/pot.h
diff --git a/.../Libraries/Source/WWVegas/WWMath/quat.cpp → .../Libraries/Source/WWVegas/WWMath/quat.cpp b/.../Libraries/Source/WWVegas/WWMath/quat.cpp → .../Libraries/Source/WWVegas/WWMath/quat.cpp
diff --git a/...de/Libraries/Source/WWVegas/WWMath/quat.h → Core/Libraries/Source/WWVegas/WWMath/quat.h b/...de/Libraries/Source/WWVegas/WWMath/quat.h → Core/Libraries/Source/WWVegas/WWMath/quat.h
diff --git a/...de/Libraries/Source/WWVegas/WWMath/rect.h → Core/Libraries/Source/WWVegas/WWMath/rect.h b/...de/Libraries/Source/WWVegas/WWMath/rect.h → Core/Libraries/Source/WWVegas/WWMath/rect.h
diff --git a/.../Libraries/Source/WWVegas/WWMath/sphere.h → .../Libraries/Source/WWVegas/WWMath/sphere.h b/.../Libraries/Source/WWVegas/WWMath/sphere.h → .../Libraries/Source/WWVegas/WWMath/sphere.h
diff --git a/...aries/Source/WWVegas/WWMath/tcbspline.cpp → ...aries/Source/WWVegas/WWMath/tcbspline.cpp b/...aries/Source/WWVegas/WWMath/tcbspline.cpp → ...aries/Source/WWVegas/WWMath/tcbspline.cpp
diff --git a/...braries/Source/WWVegas/WWMath/tcbspline.h → ...braries/Source/WWVegas/WWMath/tcbspline.h b/...braries/Source/WWVegas/WWMath/tcbspline.h → ...braries/Source/WWVegas/WWMath/tcbspline.h
diff --git a/...e/Libraries/Source/WWVegas/WWMath/tri.cpp → Core/Libraries/Source/WWVegas/WWMath/tri.cpp b/...e/Libraries/Source/WWVegas/WWMath/tri.cpp → Core/Libraries/Source/WWVegas/WWMath/tri.cpp
diff --git a/...ode/Libraries/Source/WWVegas/WWMath/tri.h → Core/Libraries/Source/WWVegas/WWMath/tri.h b/...ode/Libraries/Source/WWVegas/WWMath/tri.h → Core/Libraries/Source/WWVegas/WWMath/tri.h
diff --git a/...ibraries/Source/WWVegas/WWMath/v3_rnd.cpp → ...ibraries/Source/WWVegas/WWMath/v3_rnd.cpp b/...ibraries/Source/WWVegas/WWMath/v3_rnd.cpp → ...ibraries/Source/WWVegas/WWMath/v3_rnd.cpp
diff --git a/.../Libraries/Source/WWVegas/WWMath/v3_rnd.h → .../Libraries/Source/WWVegas/WWMath/v3_rnd.h b/.../Libraries/Source/WWVegas/WWMath/v3_rnd.h → .../Libraries/Source/WWVegas/WWMath/v3_rnd.h
diff --git a/...Libraries/Source/WWVegas/WWMath/vector2.h → ...Libraries/Source/WWVegas/WWMath/vector2.h b/...Libraries/Source/WWVegas/WWMath/vector2.h → ...Libraries/Source/WWVegas/WWMath/vector2.h
diff --git a/...ibraries/Source/WWVegas/WWMath/vector2i.h → ...ibraries/Source/WWVegas/WWMath/vector2i.h b/...ibraries/Source/WWVegas/WWMath/vector2i.h → ...ibraries/Source/WWVegas/WWMath/vector2i.h
diff --git a/...Libraries/Source/WWVegas/WWMath/vector3.h → ...Libraries/Source/WWVegas/WWMath/vector3.h b/...Libraries/Source/WWVegas/WWMath/vector3.h → ...Libraries/Source/WWVegas/WWMath/vector3.h
diff --git a/...Libraries/Source/WWVegas/WWMath/vector4.h → ...Libraries/Source/WWVegas/WWMath/vector4.h b/...Libraries/Source/WWVegas/WWMath/vector4.h → ...Libraries/Source/WWVegas/WWMath/vector4.h
diff --git a/...es/Source/WWVegas/WWMath/vehiclecurve.cpp → ...es/Source/WWVegas/WWMath/vehiclecurve.cpp b/...es/Source/WWVegas/WWMath/vehiclecurve.cpp → ...es/Source/WWVegas/WWMath/vehiclecurve.cpp
diff --git a/...ries/Source/WWVegas/WWMath/vehiclecurve.h → ...ries/Source/WWVegas/WWMath/vehiclecurve.h b/...ries/Source/WWVegas/WWMath/vehiclecurve.h → ...ries/Source/WWVegas/WWMath/vehiclecurve.h
diff --git a/...de/Libraries/Source/WWVegas/WWMath/vp.cpp → Core/Libraries/Source/WWVegas/WWMath/vp.cpp b/...de/Libraries/Source/WWVegas/WWMath/vp.cpp → Core/Libraries/Source/WWVegas/WWMath/vp.cpp
diff --git a/...Code/Libraries/Source/WWVegas/WWMath/vp.h → Core/Libraries/Source/WWVegas/WWMath/vp.h b/...Code/Libraries/Source/WWVegas/WWMath/vp.h → Core/Libraries/Source/WWVegas/WWMath/vp.h
diff --git a/...ibraries/Source/WWVegas/WWMath/wwmath.cpp → ...ibraries/Source/WWVegas/WWMath/wwmath.cpp b/...ibraries/Source/WWVegas/WWMath/wwmath.cpp → ...ibraries/Source/WWVegas/WWMath/wwmath.cpp
diff --git a/.../Libraries/Source/WWVegas/WWMath/wwmath.h → .../Libraries/Source/WWVegas/WWMath/wwmath.h b/.../Libraries/Source/WWVegas/WWMath/wwmath.h → .../Libraries/Source/WWVegas/WWMath/wwmath.h
diff --git a/...braries/Source/WWVegas/WWMath/wwmathids.h → ...braries/Source/WWVegas/WWMath/wwmathids.h b/...braries/Source/WWVegas/WWMath/wwmathids.h → ...braries/Source/WWVegas/WWMath/wwmathids.h
diff --git a/.../Source/WWVegas/WWSaveLoad/CMakeLists.txt → .../Source/WWVegas/WWSaveLoad/CMakeLists.txt b/.../Source/WWVegas/WWSaveLoad/CMakeLists.txt → .../Source/WWVegas/WWSaveLoad/CMakeLists.txt
@@ -37,11 +37,11 @@ set(WWSAVELOAD_SRC
 )
 
 # Targets to build.
-add_library(g_wwsaveload STATIC)
-set_target_properties(g_wwsaveload PROPERTIES OUTPUT_NAME wwsaveload)
+add_library(core_wwsaveload STATIC)
+set_target_properties(core_wwsaveload PROPERTIES OUTPUT_NAME wwsaveload)
 
-target_sources(g_wwsaveload PRIVATE ${WWSAVELOAD_SRC})
+target_sources(core_wwsaveload PRIVATE ${WWSAVELOAD_SRC})
 
-target_link_libraries(g_wwsaveload PRIVATE
-    g_wwcommon
+target_link_libraries(core_wwsaveload PRIVATE
+    core_wwcommon
 )
diff --git a/.../Source/WWVegas/WWSaveLoad/definition.cpp → .../Source/WWVegas/WWSaveLoad/definition.cpp b/.../Source/WWVegas/WWSaveLoad/definition.cpp → .../Source/WWVegas/WWSaveLoad/definition.cpp
diff --git a/...es/Source/WWVegas/WWSaveLoad/definition.h → ...es/Source/WWVegas/WWSaveLoad/definition.h b/...es/Source/WWVegas/WWSaveLoad/definition.h → ...es/Source/WWVegas/WWSaveLoad/definition.h
diff --git a/...e/WWVegas/WWSaveLoad/definitionclassids.h → ...e/WWVegas/WWSaveLoad/definitionclassids.h b/...e/WWVegas/WWSaveLoad/definitionclassids.h → ...e/WWVegas/WWSaveLoad/definitionclassids.h
diff --git a/.../WWVegas/WWSaveLoad/definitionfactory.cpp → .../WWVegas/WWSaveLoad/definitionfactory.cpp b/.../WWVegas/WWSaveLoad/definitionfactory.cpp → .../WWVegas/WWSaveLoad/definitionfactory.cpp
diff --git a/...ce/WWVegas/WWSaveLoad/definitionfactory.h → ...ce/WWVegas/WWSaveLoad/definitionfactory.h b/...ce/WWVegas/WWSaveLoad/definitionfactory.h → ...ce/WWVegas/WWSaveLoad/definitionfactory.h
diff --git a/...Vegas/WWSaveLoad/definitionfactorymgr.cpp → ...Vegas/WWSaveLoad/definitionfactorymgr.cpp b/...Vegas/WWSaveLoad/definitionfactorymgr.cpp → ...Vegas/WWSaveLoad/definitionfactorymgr.cpp
diff --git a/...WWVegas/WWSaveLoad/definitionfactorymgr.h → ...WWVegas/WWSaveLoad/definitionfactorymgr.h b/...WWVegas/WWSaveLoad/definitionfactorymgr.h → ...WWVegas/WWSaveLoad/definitionfactorymgr.h
diff --git a/...urce/WWVegas/WWSaveLoad/definitionmgr.cpp → ...urce/WWVegas/WWSaveLoad/definitionmgr.cpp b/...urce/WWVegas/WWSaveLoad/definitionmgr.cpp → ...urce/WWVegas/WWSaveLoad/definitionmgr.cpp
diff --git a/...Source/WWVegas/WWSaveLoad/definitionmgr.h → ...Source/WWVegas/WWSaveLoad/definitionmgr.h b/...Source/WWVegas/WWSaveLoad/definitionmgr.h → ...Source/WWVegas/WWSaveLoad/definitionmgr.h
diff --git a/...ries/Source/WWVegas/WWSaveLoad/editable.h → ...ries/Source/WWVegas/WWSaveLoad/editable.h b/...ries/Source/WWVegas/WWSaveLoad/editable.h → ...ries/Source/WWVegas/WWSaveLoad/editable.h
diff --git a/...s/Source/WWVegas/WWSaveLoad/parameter.cpp → ...s/Source/WWVegas/WWSaveLoad/parameter.cpp b/...s/Source/WWVegas/WWSaveLoad/parameter.cpp → ...s/Source/WWVegas/WWSaveLoad/parameter.cpp
diff --git a/...ies/Source/WWVegas/WWSaveLoad/parameter.h → ...ies/Source/WWVegas/WWSaveLoad/parameter.h b/...ies/Source/WWVegas/WWSaveLoad/parameter.h → ...ies/Source/WWVegas/WWSaveLoad/parameter.h
diff --git a/...Source/WWVegas/WWSaveLoad/parameterlist.h → ...Source/WWVegas/WWSaveLoad/parameterlist.h b/...Source/WWVegas/WWSaveLoad/parameterlist.h → ...Source/WWVegas/WWSaveLoad/parameterlist.h
diff --git a/...ource/WWVegas/WWSaveLoad/parametertypes.h → ...ource/WWVegas/WWSaveLoad/parametertypes.h b/...ource/WWVegas/WWSaveLoad/parametertypes.h → ...ource/WWVegas/WWSaveLoad/parametertypes.h
diff --git a/...aries/Source/WWVegas/WWSaveLoad/persist.h → ...aries/Source/WWVegas/WWSaveLoad/persist.h b/...aries/Source/WWVegas/WWSaveLoad/persist.h → ...aries/Source/WWVegas/WWSaveLoad/persist.h
diff --git a/...rce/WWVegas/WWSaveLoad/persistfactory.cpp → ...rce/WWVegas/WWSaveLoad/persistfactory.cpp b/...rce/WWVegas/WWSaveLoad/persistfactory.cpp → ...rce/WWVegas/WWSaveLoad/persistfactory.cpp
diff --git a/...ource/WWVegas/WWSaveLoad/persistfactory.h → ...ource/WWVegas/WWSaveLoad/persistfactory.h b/...ource/WWVegas/WWSaveLoad/persistfactory.h → ...ource/WWVegas/WWSaveLoad/persistfactory.h
diff --git a/...ource/WWVegas/WWSaveLoad/pointerremap.cpp → ...ource/WWVegas/WWSaveLoad/pointerremap.cpp b/...ource/WWVegas/WWSaveLoad/pointerremap.cpp → ...ource/WWVegas/WWSaveLoad/pointerremap.cpp
diff --git a/.../Source/WWVegas/WWSaveLoad/pointerremap.h → .../Source/WWVegas/WWSaveLoad/pointerremap.h b/.../Source/WWVegas/WWSaveLoad/pointerremap.h → .../Source/WWVegas/WWSaveLoad/pointerremap.h
diff --git a/.../Source/WWVegas/WWSaveLoad/postloadable.h → .../Source/WWVegas/WWSaveLoad/postloadable.h b/.../Source/WWVegas/WWSaveLoad/postloadable.h → .../Source/WWVegas/WWSaveLoad/postloadable.h
diff --git a/...es/Source/WWVegas/WWSaveLoad/saveload.cpp → ...es/Source/WWVegas/WWSaveLoad/saveload.cpp b/...es/Source/WWVegas/WWSaveLoad/saveload.cpp → ...es/Source/WWVegas/WWSaveLoad/saveload.cpp
diff --git a/...ries/Source/WWVegas/WWSaveLoad/saveload.h → ...ries/Source/WWVegas/WWSaveLoad/saveload.h b/...ries/Source/WWVegas/WWSaveLoad/saveload.h → ...ries/Source/WWVegas/WWSaveLoad/saveload.h
diff --git a/...s/Source/WWVegas/WWSaveLoad/saveloadids.h → ...s/Source/WWVegas/WWSaveLoad/saveloadids.h b/...s/Source/WWVegas/WWSaveLoad/saveloadids.h → ...s/Source/WWVegas/WWSaveLoad/saveloadids.h
diff --git a/...rce/WWVegas/WWSaveLoad/saveloadstatus.cpp → ...rce/WWVegas/WWSaveLoad/saveloadstatus.cpp b/...rce/WWVegas/WWSaveLoad/saveloadstatus.cpp → ...rce/WWVegas/WWSaveLoad/saveloadstatus.cpp
diff --git a/...ource/WWVegas/WWSaveLoad/saveloadstatus.h → ...ource/WWVegas/WWSaveLoad/saveloadstatus.h b/...ource/WWVegas/WWSaveLoad/saveloadstatus.h → ...ource/WWVegas/WWSaveLoad/saveloadstatus.h
diff --git a/.../WWVegas/WWSaveLoad/saveloadsubsystem.cpp → .../WWVegas/WWSaveLoad/saveloadsubsystem.cpp b/.../WWVegas/WWSaveLoad/saveloadsubsystem.cpp → .../WWVegas/WWSaveLoad/saveloadsubsystem.cpp
diff --git a/...ce/WWVegas/WWSaveLoad/saveloadsubsystem.h → ...ce/WWVegas/WWSaveLoad/saveloadsubsystem.h b/...ce/WWVegas/WWSaveLoad/saveloadsubsystem.h → ...ce/WWVegas/WWSaveLoad/saveloadsubsystem.h
diff --git a/...egas/WWSaveLoad/simpledefinitionfactory.h → ...egas/WWSaveLoad/simpledefinitionfactory.h b/...egas/WWSaveLoad/simpledefinitionfactory.h → ...egas/WWSaveLoad/simpledefinitionfactory.h
diff --git a/...urce/WWVegas/WWSaveLoad/simpleparameter.h → ...urce/WWVegas/WWSaveLoad/simpleparameter.h b/...urce/WWVegas/WWSaveLoad/simpleparameter.h → ...urce/WWVegas/WWSaveLoad/simpleparameter.h
diff --git a/...es/Source/WWVegas/WWSaveLoad/twiddler.cpp → ...es/Source/WWVegas/WWSaveLoad/twiddler.cpp b/...es/Source/WWVegas/WWSaveLoad/twiddler.cpp → ...es/Source/WWVegas/WWSaveLoad/twiddler.cpp
diff --git a/...ries/Source/WWVegas/WWSaveLoad/twiddler.h → ...ries/Source/WWVegas/WWSaveLoad/twiddler.h b/...ries/Source/WWVegas/WWSaveLoad/twiddler.h → ...ries/Source/WWVegas/WWSaveLoad/twiddler.h
diff --git a/.../Source/WWVegas/WWSaveLoad/wwsaveload.cpp → .../Source/WWVegas/WWSaveLoad/wwsaveload.cpp b/.../Source/WWVegas/WWSaveLoad/wwsaveload.cpp → .../Source/WWVegas/WWSaveLoad/wwsaveload.cpp
diff --git a/...es/Source/WWVegas/WWSaveLoad/wwsaveload.h → ...es/Source/WWVegas/WWSaveLoad/wwsaveload.h b/...es/Source/WWVegas/WWSaveLoad/wwsaveload.h → ...es/Source/WWVegas/WWSaveLoad/wwsaveload.h
diff --git a/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt
@@ -14,14 +14,10 @@ target_include_directories(g_wwcommon INTERFACE
     .
     WW3D2
     WWAudio
-    WWMath
-    WWSaveLoad
     Wwutil
 )
 
-add_subdirectory(WWMath)
 add_subdirectory(Wwutil)
-add_subdirectory(WWSaveLoad)
 add_subdirectory(WW3D2)
 add_subdirectory(WWDownload)
 
@@ -32,16 +28,12 @@ target_include_directories(g_wwvegas INTERFACE
     .
     WW3D2
     WWDownload
-    WWMath
-    WWSaveLoad
     Wwutil
 )
 
 target_link_libraries(g_wwvegas INTERFACE
     core_wwvegas    
     g_ww3d2
     g_wwdownload
-    g_wwmath
-    g_wwsaveload
     g_wwutil
 )
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWMath/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWMath/CMakeLists.txt
diff --git a/Generals/Code/Libraries/Source/WWVegas/WWMath/Vector3i.h b/Generals/Code/Libraries/Source/WWVegas/WWMath/Vector3i.h