unify(worldbuilder): Move unified WorldBuilder to Core

Core/Tools/CMakeLists.txt

@@ -27,6 +27,7 @@ if(RTS_BUILD_GENERALS_TOOLS OR RTS_BUILD_ZEROHOUR_TOOLS)
     add_subdirectory(ImagePacker)
     add_subdirectory(MapCacheBuilder)
     add_subdirectory(W3DView)
+    add_subdirectory(WorldBuilder)
 endif()
 
 # Add library interfaces here

Core/Tools/WorldBuilder/CMakeLists.txt

@@ -0,0 +1,231 @@
+set(WORLDBUILDER_SRC
+    "src/addplayerdialog.cpp"
+    "src/AutoEdgeOutTool.cpp"
+    "src/BaseBuildProps.cpp"
+    "src/BlendEdgeTool.cpp"
+    "src/BlendMaterial.cpp"
+    "src/BorderTool.cpp"
+    "src/brushoptions.cpp"
+    "src/BrushTool.cpp"
+    "src/BuildList.cpp"
+    "src/BuildListTool.cpp"
+    "src/CameraOptions.cpp"
+    "src/CButtonShowColor.cpp"
+    "src/CellWidth.cpp"
+    "src/CFixTeamOwnerDialog.cpp"
+    "src/ContourOptions.cpp"
+    "src/CUndoable.cpp"
+    "src/DrawObject.cpp"
+    "src/EditAction.cpp"
+    "src/EditCondition.cpp"
+    "src/EditCoordParameter.cpp"
+    "src/EditGroup.cpp"
+    "src/EditObjectParameter.cpp"
+    "src/EditParameter.cpp"
+    "src/ExportScriptsOptions.cpp"
+    "src/EyedropperTool.cpp"
+    "src/FeatherOptions.cpp"
+    "src/FeatherTool.cpp"
+    "src/FenceOptions.cpp"
+    "src/FenceTool.cpp"
+    "src/FloodFillTool.cpp"
+    "src/GlobalLightOptions.cpp"
+    "src/GroveOptions.cpp"
+    "src/GroveTool.cpp"
+    "src/HandScrollTool.cpp"
+    "src/ImpassableOptions.cpp"
+    "src/LayersList.cpp"
+    "src/LightOptions.cpp"
+    "src/MainFrm.cpp"
+    "src/mapobjectprops.cpp"
+    "src/MapPreview.cpp"
+    "src/MapSettings.cpp"
+    "src/MeshMoldOptions.cpp"
+    "src/MeshMoldTool.cpp"
+    "src/MoundOptions.cpp"
+    "src/MoundTool.cpp"
+    "src/MyToolbar.cpp"
+    "src/NewHeightMap.cpp"
+    "src/ObjectOptions.cpp"
+    "src/ObjectPreview.cpp"
+    "src/ObjectTool.cpp"
+    "src/OpenMap.cpp"
+    "src/OptionsPanel.cpp"
+    "src/PickUnitDialog.cpp"
+    "src/playerlistdlg.cpp"
+    "src/PointerTool.cpp"
+    "src/PolygonTool.cpp"
+    "src/propedit.cpp"
+    "src/RampOptions.cpp"
+    "src/RampTool.cpp"
+    "src/RoadOptions.cpp"
+    "src/RoadTool.cpp"
+    "src/RulerOptions.cpp"
+    "src/RulerTool.cpp"
+    "src/SaveMap.cpp"
+    "src/ScorchOptions.cpp"
+    "src/ScorchTool.cpp"
+    "src/ScriptActionsFalse.cpp"
+    "src/ScriptActionsTrue.cpp"
+    "src/ScriptConditions.cpp"
+    "src/ScriptDialog.cpp"
+    "src/ScriptProperties.cpp"
+    "src/SelectMacrotexture.cpp"
+    "src/ShadowOptions.cpp"
+    "src/SplashScreen.cpp"
+    "src/StdAfx.cpp"
+    "src/TeamBehavior.cpp"
+    "src/TeamGeneric.cpp"
+    "src/TeamIdentity.cpp"
+    "src/TeamObjectProperties.cpp"
+    "src/TeamReinforcement.cpp"
+    "src/teamsdialog.cpp"
+    "src/TerrainMaterial.cpp"
+    "src/TerrainModal.cpp"
+    "src/TerrainSwatches.cpp"
+    "src/TileTool.cpp"
+    "src/Tool.cpp"
+    "src/WaterOptions.cpp"
+    "src/WaterTool.cpp"
+    "src/WaypointOptions.cpp"
+    "src/WaypointTool.cpp"
+    "src/WBFrameWnd.cpp"
+    "src/WBHeightMap.cpp"
+    "src/WBPopupSlider.cpp"
+    "src/wbview.cpp"
+    "src/wbview3d.cpp"
+    "src/WHeightMapEdit.cpp"
+    "src/WorldBuilder.cpp"
+    "src/WorldBuilderDoc.cpp"
+    "src/WorldBuilderView.cpp"
+    "include/addplayerdialog.h"
+    "include/AutoEdgeOutTool.h"
+    "include/BaseBuildProps.h"
+    "include/BlendEdgeTool.h"
+    "include/BlendMaterial.h"
+    "include/BorderTool.h"
+    "include/brushoptions.h"
+    "include/BrushTool.h"
+    "include/BuildList.h"
+    "include/BuildListTool.h"
+    "include/CameraOptions.h"
+    "include/CButtonShowColor.h"
+    "include/CellWidth.h"
+    "include/CFixTeamOwnerDialog.h"
+    "include/ContourOptions.h"
+    "include/CUndoable.h"
+    "include/DrawObject.h"
+    "include/EditAction.h"
+    "include/EditCondition.h"
+    "include/EditCoordParameter.h"
+    "include/EditGroup.h"
+    "include/EditObjectParameter.h"
+    "include/EditParameter.h"
+    "include/ExportScriptsOptions.h"
+    "include/EyedropperTool.h"
+    "include/FeatherOptions.h"
+    "include/FeatherTool.h"
+    "include/FenceOptions.h"
+    "include/FenceTool.h"
+    "include/FloodFillTool.h"
+    "include/GlobalLightOptions.h"
+    "include/GroveOptions.h"
+    "include/GroveTool.h"
+    "include/HandScrollTool.h"
+    "include/ImpassableOptions.h"
+    "include/LayersList.h"
+    "include/LightOptions.h"
+    "include/MainFrm.h"
+    "include/mapobjectprops.h"
+    "include/MapPreview.h"
+    "include/MapSettings.h"
+    "include/MeshMoldOptions.h"
+    "include/MeshMoldTool.h"
+    "include/MoundOptions.h"
+    "include/MoundTool.h"
+    "include/MyToolbar.h"
+    "include/NewHeightMap.h"
+    "include/ObjectOptions.h"
+    "include/ObjectPreview.h"
+    "include/ObjectTool.h"
+    "include/OpenMap.h"
+    "include/OptionsPanel.h"
+    "include/PickUnitDialog.h"
+    "include/playerlistdlg.h"
+    "include/PointerTool.h"
+    "include/PolygonTool.h"
+    "include/propedit.h"
+    "include/RampOptions.h"
+    "include/RampTool.h"
+    "include/RoadOptions.h"
+    "include/RoadTool.h"
+    "include/RulerOptions.h"
+    "include/RulerTool.h"
+    "include/SaveMap.h"
+    "include/ScorchOptions.h"
+    "include/ScorchTool.h"
+    "include/ScriptActionsFalse.h"
+    "include/ScriptActionsTrue.h"
+    "include/ScriptConditions.h"
+    "include/ScriptDialog.h"
+    "include/ScriptProperties.h"
+    "include/SelectMacrotexture.h"
+    "include/ShadowOptions.h"
+    "include/SplashScreen.h"
+    "include/StdAfx.h"
+    "include/TeamBehavior.h"
+    "include/TeamGeneric.h"
+    "include/TeamIdentity.h"
+    "include/TeamObjectProperties.h"
+    "include/TeamReinforcement.h"
+    "include/teamsdialog.h"
+    "include/TerrainMaterial.h"
+    "include/TerrainModal.h"
+    "include/TerrainSwatches.h"
+    "include/TileTool.h"
+    "include/Tool.h"
+    "include/WaterOptions.h"
+    "include/WaterTool.h"
+    "include/WaypointOptions.h"
+    "include/WaypointTool.h"
+    "include/WBFrameWnd.h"
+    "include/WBHeightMap.h"
+    "include/WBPopupSlider.h"
+    "include/wbview.h"
+    "include/wbview3d.h"
+    "include/WHeightMapEdit.h"
+    "include/WorldBuilder.h"
+    "include/WorldBuilderDoc.h"
+    "include/WorldBuilderView.h"
+)
+
+add_library(corei_worldbuilder INTERFACE)
+
+target_sources(corei_worldbuilder INTERFACE ${WORLDBUILDER_SRC})
+
+target_include_directories(corei_worldbuilder INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    include
+    res
+)
+
+target_precompile_headers(corei_worldbuilder INTERFACE
+    [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6
+    [["WWLib/always.h"]]
+    [["Common/STLTypedefs.h"]]
+    [["StdAfx.h"]]
+    [["WWLib/WWCommon.h"]]
+)
+
+target_link_libraries(corei_worldbuilder INTERFACE
+    core_browserdispatch
+    d3d8lib
+    imm32
+    vfw32
+    winmm
+)
+
+if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
+    target_link_options(corei_worldbuilder INTERFACE /NODEFAULTLIB:libci.lib /NODEFAULTLIB:libc.lib)
+    target_sources(corei_worldbuilder INTERFACE res/WorldBuilder.rc)
+endif()

Generals/Code/Tools/WorldBuilder/res/WorldBuilder.rc → Core/Tools/WorldBuilder/res/WorldBuilder.rc

@@ -84,7 +84,11 @@ IDB_DownArrow           BITMAP  DISCARDABLE     "IDB_DownArrow.bmp"
 IDB_FOLDER              BITMAP  DISCARDABLE     "folder.bmp"
 IDB_ROAD_CORNERS        BITMAP  DISCARDABLE     "IDB_ROAD_CORNERS.bmp"
 IDB_FOLDERSCRIPT        BITMAP  DISCARDABLE     "foldersc.bmp"
-IDB_WORLDBUILDERSPLASH  BITMAP  DISCARDABLE     "WorldBuilder.bmp"
+#if RTS_GENERALS
+IDB_WORLDBUILDERSPLASH  BITMAP  DISCARDABLE     "WorldBuilderV.bmp"
+#elif RTS_ZEROHOUR
+IDB_WORLDBUILDERSPLASH  BITMAP  DISCARDABLE     "WorldBuilderZH.bmp"
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 //