[CMAKE][CORE] Move max2w3d to Core

Core/Tools/CMakeLists.txt

@@ -8,4 +8,5 @@ endif()
 # Build less useful tool/test binaries.
 if(RTS_BUILD_CORE_EXTRAS)
     add_subdirectory(Compress)
+    add_subdirectory(WW3D)
 endif()

GeneralsMD/Code/Tools/WW3D/max2w3d/CMakeLists.txt → Core/Tools/WW3D/max2w3d/CMakeLists.txt

@@ -146,31 +146,31 @@ set(MAX2W3D_SRC
     "w3dutil.h"
 )
 
-add_library(z_max2w3d SHARED)
-set_target_properties(z_max2w3d PROPERTIES OUTPUT_NAME max2w3d SUFFIX ".dle")
+add_library(core_max2w3d SHARED)
+set_target_properties(core_max2w3d PROPERTIES OUTPUT_NAME max2w3d SUFFIX ".dle")
 
-target_include_directories(z_max2w3d PRIVATE
+target_include_directories(core_max2w3d PRIVATE
     "../pluglib"
 )
 
-target_sources(z_max2w3d PRIVATE ${MAX2W3D_SRC})
+target_sources(core_max2w3d PRIVATE ${MAX2W3D_SRC})
 
 # TODO: What does W3D_MAX4 do? Needs cmake option?
-target_compile_definitions(z_max2w3d PRIVATE W3D_MAX4)
+target_compile_definitions(core_max2w3d PRIVATE W3D_MAX4)
 
-target_link_libraries(z_max2w3d PRIVATE
+target_link_libraries(core_max2w3d PRIVATE
     Comctl32
     # This is only linked to have its basetsd.h used instead of the vs6's basetsd.h
     # The headers typedef INT_PTR to different types, but maxsdk expects it
     # typedef'ed to int, otherwise throws linker errors.
     d3d8lib
     maxsdk
     winmm
-    z_pluglib
+    core_pluglib
 )
 
-set_target_properties(z_max2w3d PROPERTIES LINK_FLAGS "/DEF:max2w3d.def")
+set_target_properties(core_max2w3d PROPERTIES LINK_FLAGS "/DEF:max2w3d.def")
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    target_sources(z_max2w3d PRIVATE max2w3d.rc)
+    target_sources(core_max2w3d PRIVATE max2w3d.rc)
 endif()

Generals/Code/Tools/WW3D/pluglib/CMakeLists.txt → Core/Tools/WW3D/pluglib/CMakeLists.txt

@@ -53,9 +53,9 @@ set(PLUGLIB_SRC
     "WWmatrix3.h"
 )
 
-add_library(g_pluglib STATIC)
-set_target_properties(g_pluglib PROPERTIES OUTPUT_NAME pluglib)
+add_library(core_pluglib STATIC)
+set_target_properties(core_pluglib PROPERTIES OUTPUT_NAME pluglib)
 
-target_sources(g_pluglib PRIVATE ${PLUGLIB_SRC})
+target_sources(core_pluglib PRIVATE ${PLUGLIB_SRC})
 
-target_link_libraries(g_pluglib PRIVATE maxsdk)
+target_link_libraries(core_pluglib PRIVATE maxsdk)

Generals/Code/Tools/CMakeLists.txt

@@ -24,5 +24,4 @@ if(RTS_BUILD_GENERALS_EXTRAS)
     add_subdirectory(timingTest)
     add_subdirectory(versionUpdate)
     add_subdirectory(wolSetup)
-    add_subdirectory(WW3D)
 endif()