[CORE] Move w3dview files with a cmake interface to Core and setup independent W3DView executables for Generals and Zero Hour

Author: xezon

Core/Tools/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 # Build useful tool binaries.
 if(RTS_BUILD_CORE_TOOLS)
-    # TODO: add subdirectory...
+    # add_subdirectory(W3DView)
 endif()
 
 # Build less useful tool/test binaries.
@@ -11,3 +11,14 @@ if(RTS_BUILD_CORE_EXTRAS)
     add_subdirectory(CRCDiff)
     add_subdirectory(WW3D)
 endif()
+
+# REMOVE THIS WHEN CORE IS PRISTINE
+# Add library interfaces here
+if(RTS_BUILD_GENERALS_TOOLS OR RTS_BUILD_ZEROHOUR_TOOLS)
+add_subdirectory(W3DView)
+endif()
+
+# REMOVE THIS WHEN CORE IS PRISTINE
+# Add library interfaces here
+if(RTS_BUILD_GENERALS_EXTRAS OR RTS_BUILD_ZEROHOUR_EXTRAS)
+endif()

GeneralsMD/Code/Tools/W3DView/AddToLineupDialog.cpp renamed to Core/Tools/W3DView/AddToLineupDialog.cpp

@@ -0,0 +1,199 @@
+set(W3DVIEW_SRC
+    "AddToLineupDialog.cpp"
+    "AddToLineupDialog.h"
+    "AdvancedAnimSheet.cpp"
+    "AdvancedAnimSheet.h"
+    "AggregateNameDialog.cpp"
+    "AggregateNameDialog.h"
+    "AmbientLightDialog.cpp"
+    "AmbientLightDialog.h"
+    "AnimatedSoundOptionsDialog.cpp"
+    "AnimatedSoundOptionsDialog.h"
+    "AnimationPropPage.cpp"
+    "AnimationPropPage.h"
+    "AnimationSpeed.cpp"
+    "AnimationSpeed.h"
+    "AnimMixingPage.cpp"
+    "AnimMixingPage.h"
+    "AnimReportPage.cpp"
+    "AnimReportPage.h"
+    "AssetInfo.cpp"
+    "AssetInfo.h"
+    "AssetPropertySheet.cpp"
+    "AssetPropertySheet.h"
+    "AssetTypes.h"
+    "BackgroundBMPDialog.cpp"
+    "BackgroundBMPDialog.h"
+    "BackgroundColorDialog.cpp"
+    "BackgroundColorDialog.h"
+    "BackgroundObjectDialog.cpp"
+    "BackgroundObjectDialog.h"
+    "BoneMgrDialog.cpp"
+    "BoneMgrDialog.h"
+    "CameraDistanceDialog.cpp"
+    "CameraDistanceDialog.h"
+    "CameraSettingsDialog.cpp"
+    "CameraSettingsDialog.h"
+    "ColorBar.cpp"
+    "ColorBar.h"
+    "ColorPicker.cpp"
+    "ColorPicker.h"
+    "ColorPickerDialogClass.cpp"
+    "ColorPickerDialogClass.h"
+    "ColorSelectionDialog.cpp"
+    "ColorSelectionDialog.h"
+    "ColorUtils.cpp"
+    "ColorUtils.h"
+    "DataTreeView.cpp"
+    "DataTreeView.h"
+    "DeviceSelectionDialog.cpp"
+    "DeviceSelectionDialog.h"
+    "DialogToolbar.cpp"
+    "DialogToolbar.h"
+    "DirectoryDialog.cpp"
+    "DirectoryDialog.h"
+    "EditLODDialog.cpp"
+    "EditLODDialog.h"
+    "EmitterColorPropPage.cpp"
+    "EmitterColorPropPage.h"
+    "EmitterFramePropPage.cpp"
+    "EmitterFramePropPage.h"
+    "EmitterGeneralPropPage.cpp"
+    "EmitterGeneralPropPage.h"
+    "EmitterInstanceList.cpp"
+    "EmitterInstanceList.h"
+    "EmitterLineGroupPropPage.cpp"
+    "EmitterLineGroupPropPage.h"
+    "EmitterLinePropPage.cpp"
+    "EmitterLinePropPage.h"
+    "EmitterParticlePropPage.cpp"
+    "EmitterParticlePropPage.h"
+    "EmitterPhysicsPropPage.cpp"
+    "EmitterPhysicsPropPage.h"
+    "EmitterPropertySheet.cpp"
+    "EmitterPropertySheet.h"
+    "EmitterRotationPropPage.cpp"
+    "EmitterRotationPropPage.h"
+    "EmitterSizePropPage.cpp"
+    "EmitterSizePropPage.h"
+    "EmitterUserPropPage.cpp"
+    "EmitterUserPropPage.h"
+    "GammaDialog.cpp"
+    "GammaDialog.h"
+    "Globals.cpp"
+    "Globals.h"
+    "GraphicView.cpp"
+    "GraphicView.h"
+    "HierarchyPropPage.cpp"
+    "HierarchyPropPage.h"
+    "LODDefs.h"
+    "MainFrm.cpp"
+    "MainFrm.h"
+    "MeshPropPage.cpp"
+    "MeshPropPage.h"
+    "OpacitySettingsDialog.cpp"
+    "OpacitySettingsDialog.h"
+    "OpacityVectorDialog.cpp"
+    "OpacityVectorDialog.h"
+    "ParticleBlurTimeKeyDialog.cpp"
+    "ParticleBlurTimeKeyDialog.h"
+    "ParticleFrameKeyDialog.cpp"
+    "ParticleFrameKeyDialog.h"
+    "ParticleRotationKeyDialog.cpp"
+    "ParticleRotationKeyDialog.h"
+    "ParticleSizeDialog.cpp"
+    "ParticleSizeDialog.h"
+    "PlaySoundDialog.cpp"
+    "PlaySoundDialog.h"
+    "ResolutionDialog.cpp"
+    "ResolutionDialog.h"
+    "resource.h"
+    "RestrictedFileDialog.cpp"
+    "RestrictedFileDialog.h"
+    "RingColorPropPage.cpp"
+    "RingColorPropPage.h"
+    "RingGeneralPropPage.cpp"
+    "RingGeneralPropPage.h"
+    "RingPropertySheet.cpp"
+    "RingPropertySheet.h"
+    "RingSizePropPage.cpp"
+    "RingSizePropPage.h"
+    "SaveSettingsDialog.cpp"
+    "SaveSettingsDialog.h"
+    "ScaleDialog.cpp"
+    "ScaleDialog.h"
+    "SceneLightDialog.cpp"
+    "SceneLightDialog.h"
+    "ScreenCursor.cpp"
+    "ScreenCursor.h"
+    "SoundEditDialog.cpp"
+    "SoundEditDialog.h"
+    "SphereColorPropPage.cpp"
+    "SphereColorPropPage.h"
+    "SphereGeneralPropPage.cpp"
+    "SphereGeneralPropPage.h"
+    "SpherePropertySheet.cpp"
+    "SpherePropertySheet.h"
+    "SphereSizePropPage.cpp"
+    "SphereSizePropPage.h"
+    #"SphereUtils.cpp" # Unused and does not compile
+    #"SphereUtils.h" # Unused and does not compile
+    "StdAfx.cpp"
+    "StdAfx.h"
+    #"TextureMgrDialog.cpp" # Unused
+    #"TextureMgrDialog.h" # Unused
+    "TexturePathDialog.cpp"
+    "TexturePathDialog.h"
+    #"TextureSettingsDialog.cpp" # Unused
+    #"TextureSettingsDialog.h" # Unused
+    "Toolbar.cpp"
+    "Toolbar.h"
+    "Utils.cpp"
+    "Utils.h"
+    "Vector3RndCombo.cpp"
+    "Vector3RndCombo.H"
+    "ViewerAssetMgr.cpp"
+    "ViewerAssetMgr.h"
+    "ViewerScene.cpp"
+    "ViewerScene.h"
+    "VolumeRandomDialog.cpp"
+    "VolumeRandomDialog.h"
+    "W3DView.cpp"
+    "W3DView.h"
+    "W3DViewDoc.cpp"
+    "W3DViewDoc.h"
+    "W3DViewView.cpp"
+    "W3DViewView.h"
+)
+
+add_library(corei_w3dview INTERFACE)
+#add_executable(core_w3dview WIN32)
+
+target_sources(corei_w3dview INTERFACE ${W3DVIEW_SRC})
+#target_sources(core_w3dview PRIVATE ${W3DVIEW_SRC})
+
+#target_link_libraries(core_w3dview PRIVATE
+#    core_config
+#    core_utility
+#    core_wwstub # avoid linking GameEngine
+#    d3d8
+#    d3d8lib
+#    d3dx8
+#    dbghelplib
+#    imm32
+#    milesstub
+#    Version
+#    vfw32
+#    winmm
+#    z_wwaudio
+#    z_wwvegas
+#)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_sources(corei_w3dview INTERFACE W3DView.rc)
+    #target_compile_definitions(core_w3dview PRIVATE _AFXDLL)
+    #target_sources(core_w3dview PRIVATE W3DView.rc)
+    #set_target_properties(core_w3dview PROPERTIES OUTPUT_NAME W3DView)
+#else()
+    #set_target_properties(core_w3dview PROPERTIES OUTPUT_NAME w3dview)
+endif()

GeneralsMD/Code/Tools/W3DView/AddToLineupDialog.h renamed to Core/Tools/W3DView/AddToLineupDialog.h

@@ -7,6 +7,7 @@ if(RTS_BUILD_GENERALS_TOOLS)
     add_subdirectory(ImagePacker)
     add_subdirectory(MapCacheBuilder)
     add_subdirectory(ParticleEditor)
+    # add_subdirectory(W3DView)
     add_subdirectory(WorldBuilder)
 endif()
 

GeneralsMD/Code/Tools/W3DView/AdvancedAnimSheet.cpp renamed to Core/Tools/W3DView/AdvancedAnimSheet.cpp

@@ -0,0 +1,26 @@
+add_executable(g_w3dview WIN32)
+
+target_link_libraries(g_w3dview PRIVATE
+    core_config
+    core_utility
+    core_wwstub # avoid linking GameEngine
+    corei_w3dview # this interface gets the source files for the tool
+    d3d8
+    d3d8lib
+    d3dx8
+    dbghelplib
+    imm32
+    milesstub
+    Version
+    vfw32
+    winmm
+    g_wwaudio
+    g_wwvegas
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_compile_definitions(g_w3dview PRIVATE _AFXDLL)
+    set_target_properties(g_w3dview PROPERTIES OUTPUT_NAME W3DViewV)
+else()
+    set_target_properties(g_w3dview PROPERTIES OUTPUT_NAME w3dviewv)
+endif()

GeneralsMD/Code/Tools/W3DView/AdvancedAnimSheet.h renamed to Core/Tools/W3DView/AdvancedAnimSheet.h

@@ -1,11 +1,6 @@
 # Interface libraries to set common defines and includes, avoid duplication later
 add_library(z_wwcommon INTERFACE)
 
-target_compile_definitions(z_wwcommon INTERFACE
-    #NOMINMAX
-    WIN32_LEAN_AND_MEAN
-)
-
 target_link_libraries(z_wwcommon INTERFACE
     d3d8lib
     core_config