unify(particlesys): Move ParticleSys and ParticleEditor files to Core

Core/GameEngine/CMakeLists.txt

@@ -212,7 +212,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Module/SwayClientUpdate.h
 #    Include/GameClient/Mouse.h
     Include/GameClient/ParabolicEase.h
-#    Include/GameClient/ParticleSys.h
+    Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
 #    Include/GameClient/ProcessAnimateWindow.h
 #    Include/GameClient/RadiusDecal.h
@@ -828,7 +828,7 @@ set(GAMEENGINE_SRC
     Source/GameClient/System/Debug/AudioDebugDisplay.cpp
 #    Source/GameClient/System/DebugDisplay.cpp
 #    Source/GameClient/System/Image.cpp
-#    Source/GameClient/System/ParticleSys.cpp
+    Source/GameClient/System/ParticleSys.cpp
 #    Source/GameClient/System/RayEffect.cpp
     Source/GameClient/System/Smudge.cpp
     Source/GameClient/Terrain/TerrainRoads.cpp

Core/Tools/CMakeLists.txt

@@ -3,6 +3,7 @@
 # Build useful tool binaries.
 if(RTS_BUILD_CORE_TOOLS)
     add_subdirectory(DebugWindow)
+    add_subdirectory(ParticleEditor)
 endif()
 
 # Build less useful tool/test binaries.

GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt → Core/Tools/ParticleEditor/CMakeLists.txt

@@ -26,32 +26,31 @@ set(PARTICLEED_SRC
     "VelocityTypePanels.h"
 )
 
-add_library(z_particleeditor SHARED)
-set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME particleeditor PREFIX "")
+add_library(core_particleeditor SHARED)
+set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME particleeditor PREFIX "")
 
-target_sources(z_particleeditor PRIVATE ${PARTICLEED_SRC})
+target_sources(core_particleeditor PRIVATE ${PARTICLEED_SRC})
 
-target_include_directories(z_particleeditor PRIVATE
+target_include_directories(core_particleeditor PRIVATE
     include
     res
 )
 
-target_link_libraries(z_particleeditor PRIVATE
+target_link_libraries(core_particleeditor PRIVATE
     core_debug
     core_profile
+    corei_always_no_pch
+    corei_gameengine_include
     corei_libraries_source_wwvegas
     corei_libraries_source_wwvegas_wwlib
     stlport
-    zi_always_no_pch
-    zi_gameengine_include
-    zi_libraries_source_wwvegas
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
-    target_link_options(z_particleeditor PRIVATE /NODEFAULTLIB:libci.lib /NODEFAULTLIB:libc.lib)
-    target_compile_definitions(z_particleeditor PRIVATE _AFXDLL)
-    target_sources(z_particleeditor PRIVATE ParticleEditor.rc)
-    set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME ParticleEditor)
+    target_link_options(core_particleeditor PRIVATE /NODEFAULTLIB:libci.lib /NODEFAULTLIB:libc.lib)
+    target_compile_definitions(core_particleeditor PRIVATE _AFXDLL)
+    target_sources(core_particleeditor PRIVATE ParticleEditor.rc)
+    set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME ParticleEditor)
 else()
-    set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME particleeditor)
+    set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME particleeditor)
 endif()

Generals/CMakeLists.txt

@@ -48,14 +48,14 @@ if(RTS_INSTALL_PREFIX_GENERALS)
         install(FILES $<TARGET_PDB_FILE:g_worldbuilder> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
     endif()
 
-    if(TARGET g_particleeditor)
-        install(TARGETS g_particleeditor RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
-        install(FILES $<TARGET_PDB_FILE:g_particleeditor> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
+    if(TARGET core_particleeditor)
+        install(TARGETS core_particleeditor RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
+        install(FILES $<TARGET_PDB_FILE:core_particleeditor> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
     endif()
 
-    if(TARGET g_debugwindow)
-        install(TARGETS g_debugwindow RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
-        install(FILES $<TARGET_PDB_FILE:g_debugwindow> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
+    if(TARGET core_debugwindow)
+        install(TARGETS core_debugwindow RUNTIME DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}")
+        install(FILES $<TARGET_PDB_FILE:core_debugwindow> DESTINATION "${RTS_INSTALL_PREFIX_GENERALS}" OPTIONAL)
     endif()
 
     if(TARGET g_guiedit)

Generals/Code/GameEngine/CMakeLists.txt

@@ -200,7 +200,7 @@ set(GAMEENGINE_SRC
     Include/GameClient/Module/BeaconClientUpdate.h
     Include/GameClient/Module/SwayClientUpdate.h
     Include/GameClient/Mouse.h
-    Include/GameClient/ParticleSys.h
+#    Include/GameClient/ParticleSys.h
     Include/GameClient/PlaceEventTranslator.h
     Include/GameClient/ProcessAnimateWindow.h
     Include/GameClient/RadiusDecal.h
@@ -773,7 +773,7 @@ set(GAMEENGINE_SRC
 #    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
     Source/GameClient/System/DebugDisplay.cpp
     Source/GameClient/System/Image.cpp
-    Source/GameClient/System/ParticleSys.cpp
+#    Source/GameClient/System/ParticleSys.cpp
     Source/GameClient/System/RayEffect.cpp
 #    Source/GameClient/Terrain/TerrainRoads.cpp
 #    Source/GameClient/Terrain/TerrainVisual.cpp