[CMAKE][CORE] Move WWSaveLoad and most of WWMath to Core (#694)

Author: xezon

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,10 +42,9 @@ target_include_directories(core_wwvegas INTERFACE
     WWDebug
     #WWDownload
     WWLib
-    #WWMath
-    #WWSaveLoad
+    WWMath
+    WWSaveLoad
     #Wwutil
-    #wwshade
 )
 
 target_link_libraries(core_wwvegas INTERFACE
@@ -52,7 +53,7 @@ target_link_libraries(core_wwvegas INTERFACE
     # core_wwdownload
     core_wwlib
     # core_wwmath
-    # core_wwsaveload
+    core_wwsaveload
     # core_wwshade
     # core_wwutil
 )

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

@@ -0,0 +1,94 @@
+set(WWMATH_SRC
+    aabox.cpp
+    aabox.h
+    aabtreecull.cpp
+    aabtreecull.h
+    aaplane.h
+    #cardinalspline.cpp # to be moved
+    cardinalspline.h
+    castres.h
+    catmullromspline.cpp
+    catmullromspline.h
+    colmath.cpp
+    colmath.h
+    #colmathaabox.cpp # to be moved
+    colmathaabox.h
+    #colmathaabtri.cpp # to be moved
+    colmathfrustum.cpp
+    colmathfrustum.h
+    colmathinlines.h
+    colmathline.cpp
+    colmathline.h
+    #colmathobbobb.cpp # to be moved
+    colmathobbox.cpp
+    #colmathobbtri.cpp # to be moved
+    colmathplane.cpp
+    colmathplane.h
+    colmathsphere.cpp
+    cullsys.cpp
+    cullsys.h
+    culltype.h
+    curve.cpp
+    curve.h
+    euler.cpp
+    euler.h
+    frustum.cpp
+    frustum.h
+    gridcull.cpp
+    gridcull.h
+    hermitespline.cpp
+    hermitespline.h
+    lineseg.cpp
+    lineseg.h
+    lookuptable.cpp
+    lookuptable.h
+    matrix3.cpp
+    matrix3.h
+    matrix3d.cpp
+    matrix3d.h
+    matrix4.cpp
+    matrix4.h
+    #normalcone.h
+    obbox.cpp
+    obbox.h
+    ode.cpp
+    ode.h
+    plane.h
+    pot.cpp
+    pot.h
+    quat.cpp
+    quat.h
+    rect.h
+    sphere.h
+    tcbspline.cpp
+    tcbspline.h
+    tri.cpp
+    tri.h
+    v3_rnd.cpp
+    v3_rnd.h
+    vector2.h
+    vector2i.h
+    vector3.h
+    Vector3i.h
+    vector4.h
+    vehiclecurve.cpp
+    vehiclecurve.h
+    vp.cpp
+    vp.h
+    wwmath.cpp
+    wwmath.h
+    wwmathids.h
+)
+
+# Targets to build.
+add_library(core_wwmath STATIC)
+set_target_properties(core_wwmath PROPERTIES OUTPUT_NAME wwmath)
+
+target_sources(core_wwmath PRIVATE ${WWMATH_SRC})
+
+target_link_libraries(core_wwmath PRIVATE
+    core_wwcommon
+)
+
+# @todo Test its impact and see what to do with the legacy functions.
+#add_compile_definitions(core_wwmath PUBLIC ALLOW_TEMPORARIES) # Enables legacy math with "temporaries"

GeneralsMD/Code/Libraries/Source/WWVegas/WWMath/Vector3i.h renamed to Core/Libraries/Source/WWVegas/WWMath/Vector3i.h

@@ -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
 )

GeneralsMD/Code/Libraries/Source/WWVegas/WWMath/aabox.cpp renamed to Core/Libraries/Source/WWVegas/WWMath/aabox.cpp

@@ -14,14 +14,11 @@ 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 +29,13 @@ target_include_directories(g_wwvegas INTERFACE
     .
     WW3D2
     WWDownload
-    WWMath
-    WWSaveLoad
     Wwutil
 )
 
 target_link_libraries(g_wwvegas INTERFACE
-    core_wwvegas    
+    core_wwvegas
     g_ww3d2
     g_wwdownload
     g_wwmath
-    g_wwsaveload
     g_wwutil
 )

GeneralsMD/Code/Libraries/Source/WWVegas/WWMath/aabox.h renamed to Core/Libraries/Source/WWVegas/WWMath/aabox.h

@@ -1,93 +1,18 @@
 set(WWMATH_SRC
-    aabox.cpp
-    aabox.h
-    aabtreecull.cpp
-    aabtreecull.h
-    aaplane.h
     cardinalspline.cpp
-    cardinalspline.h
-    castres.h
-    catmullromspline.cpp
-    catmullromspline.h
-    colmath.cpp
-    colmath.h
     colmathaabox.cpp
-    colmathaabox.h
     colmathaabtri.cpp
-    colmathfrustum.cpp
-    colmathfrustum.h
-    colmathinlines.h
-    colmathline.cpp
-    colmathline.h
     colmathobbobb.cpp
-    colmathobbox.cpp
     colmathobbtri.cpp
-    colmathplane.cpp
-    colmathplane.h
-    colmathsphere.cpp
-    cullsys.cpp
-    cullsys.h
-    culltype.h
-    curve.cpp
-    curve.h
-    euler.cpp
-    euler.h
-    frustum.cpp
-    frustum.h
-    gridcull.cpp
-    gridcull.h
-    hermitespline.cpp
-    hermitespline.h
-    lineseg.cpp
-    lineseg.h
-    lookuptable.cpp
-    lookuptable.h
-    matrix3.cpp
-    matrix3.h
-    matrix3d.cpp
-    matrix3d.h
-    matrix4.cpp
-    matrix4.h
-    obbox.cpp
-    obbox.h
-    ode.cpp
-    ode.h
-    plane.h
-    pot.cpp
-    pot.h
-    quat.cpp
-    quat.h
-    rect.h
-    sphere.h
-    tcbspline.cpp
-    tcbspline.h
-    tri.cpp
-    tri.h
-    v3_rnd.cpp
-    v3_rnd.h
-    vector2.h
-    vector2i.h
-    vector3.h
-    Vector3i.h
-    vector4.h
-    vehiclecurve.cpp
-    vehiclecurve.h
-    vp.cpp
-    vp.h
-    wwmath.cpp
-    wwmath.h
-    wwmathids.h
 )
 
 # Targets to build.
 add_library(g_wwmath STATIC)
-set_target_properties(g_wwmath PROPERTIES OUTPUT_NAME wwmath)
+#set_target_properties(g_wwmath PROPERTIES OUTPUT_NAME wwmath)
 
 target_sources(g_wwmath PRIVATE ${WWMATH_SRC})
 
 target_link_libraries(g_wwmath PRIVATE
+    core_wwmath
     g_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"