Skip to content

Commit 22d757f

Browse files
authored
unify(particlesys): Move ParticleSys and ParticleEditor files to Core (TheSuperHackers#2212)
1 parent 7af8c63 commit 22d757f

File tree

77 files changed

+65
-11203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+65
-11203
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ set(GAMEENGINE_SRC
212212
# Include/GameClient/Module/SwayClientUpdate.h
213213
# Include/GameClient/Mouse.h
214214
Include/GameClient/ParabolicEase.h
215-
# Include/GameClient/ParticleSys.h
215+
Include/GameClient/ParticleSys.h
216216
# Include/GameClient/PlaceEventTranslator.h
217217
# Include/GameClient/ProcessAnimateWindow.h
218218
# Include/GameClient/RadiusDecal.h
@@ -828,7 +828,7 @@ set(GAMEENGINE_SRC
828828
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
829829
# Source/GameClient/System/DebugDisplay.cpp
830830
# Source/GameClient/System/Image.cpp
831-
# Source/GameClient/System/ParticleSys.cpp
831+
Source/GameClient/System/ParticleSys.cpp
832832
# Source/GameClient/System/RayEffect.cpp
833833
Source/GameClient/System/Smudge.cpp
834834
Source/GameClient/Terrain/TerrainRoads.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h renamed to Core/GameEngine/Include/GameClient/ParticleSys.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp renamed to Core/GameEngine/Source/GameClient/System/ParticleSys.cpp

File renamed without changes.

Core/Tools/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Build useful tool binaries.
44
if(RTS_BUILD_CORE_TOOLS)
55
add_subdirectory(DebugWindow)
6+
add_subdirectory(ParticleEditor)
67
endif()
78

89
# Build less useful tool/test binaries.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

GeneralsMD/Code/Tools/ParticleEditor/CMakeLists.txt renamed to Core/Tools/ParticleEditor/CMakeLists.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,31 @@ set(PARTICLEED_SRC
2626
"VelocityTypePanels.h"
2727
)
2828

29-
add_library(z_particleeditor SHARED)
30-
set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME particleeditor PREFIX "")
29+
add_library(core_particleeditor SHARED)
30+
set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME particleeditor PREFIX "")
3131

32-
target_sources(z_particleeditor PRIVATE ${PARTICLEED_SRC})
32+
target_sources(core_particleeditor PRIVATE ${PARTICLEED_SRC})
3333

34-
target_include_directories(z_particleeditor PRIVATE
34+
target_include_directories(core_particleeditor PRIVATE
3535
include
3636
res
3737
)
3838

39-
target_link_libraries(z_particleeditor PRIVATE
39+
target_link_libraries(core_particleeditor PRIVATE
4040
core_debug
4141
core_profile
42+
corei_always_no_pch
43+
corei_gameengine_include
4244
corei_libraries_source_wwvegas
4345
corei_libraries_source_wwvegas_wwlib
4446
stlport
45-
zi_always_no_pch
46-
zi_gameengine_include
47-
zi_libraries_source_wwvegas
4847
)
4948

5049
if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
51-
target_link_options(z_particleeditor PRIVATE /NODEFAULTLIB:libci.lib /NODEFAULTLIB:libc.lib)
52-
target_compile_definitions(z_particleeditor PRIVATE _AFXDLL)
53-
target_sources(z_particleeditor PRIVATE ParticleEditor.rc)
54-
set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME ParticleEditor)
50+
target_link_options(core_particleeditor PRIVATE /NODEFAULTLIB:libci.lib /NODEFAULTLIB:libc.lib)
51+
target_compile_definitions(core_particleeditor PRIVATE _AFXDLL)
52+
target_sources(core_particleeditor PRIVATE ParticleEditor.rc)
53+
set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME ParticleEditor)
5554
else()
56-
set_target_properties(z_particleeditor PROPERTIES OUTPUT_NAME particleeditor)
55+
set_target_properties(core_particleeditor PROPERTIES OUTPUT_NAME particleeditor)
5756
endif()
File renamed without changes.

0 commit comments

Comments
 (0)