Merge branch 'jaro/particle-system-master' into niels/RenderingParticle

1 files changed, 8 insertions, 7 deletions

diff --git a/src/makefile b/src/makefile
index b9c44c8..356179e 100644
--- a/src/makefile
+++ b/src/makefile
@@ -26,8 +26,8 @@ MAX += crepe/ComponentManager.h
 MAX += crepe/ComponentManager.hpp
 MAX += crepe/api/Metadata.cpp
 MAX += crepe/api/Metadata.h
-TODO += crepe/Particle.cpp
-TODO += crepe/Particle.h
+JARO += crepe/Particle.cpp
+JARO += crepe/Particle.h
 TODO += crepe/Position.h
 TODO += crepe/api/AssetManager.cpp
 TODO += crepe/api/AssetManager.h
@@ -44,8 +44,8 @@ LOEK += crepe/api/Config.h
 MAX += crepe/api/GameObject.cpp
 MAX += crepe/api/GameObject.h
 MAX += crepe/api/GameObject.hpp
-TODO += crepe/api/ParticleEmitter.cpp
-TODO += crepe/api/ParticleEmitter.h
+JARO += crepe/api/ParticleEmitter.cpp
+JARO += crepe/api/ParticleEmitter.h
 TODO += crepe/api/Vector2.h
 TODO += crepe/api/Vector2.cpp
 JARO += crepe/api/Rigidbody.cpp
@@ -67,8 +67,8 @@ LOEK += crepe/facade/SoundContext.cpp
 LOEK += crepe/facade/SoundContext.h
 TODO += crepe/system/CollisionSystem.cpp
 TODO += crepe/system/CollisionSystem.h
-TODO += crepe/system/ParticleSystem.cpp
-TODO += crepe/system/ParticleSystem.h
+JARO += crepe/system/ParticleSystem.cpp
+JARO += crepe/system/ParticleSystem.h
 JARO += crepe/system/PhysicsSystem.cpp
 JARO += crepe/system/PhysicsSystem.h
 TODO += crepe/system/RenderSystem.cpp
@@ -87,13 +87,14 @@ LOEK += example/audio_internal.cpp
 TODO += example/components_internal.cpp
 MAX += example/ecs.cpp
 LOEK += example/log.cpp
-TODO += example/particle.cpp
+JARO += example/particles.cpp
 JARO += example/physics.cpp
 TODO += example/rendering.cpp
 LOEK += example/script.cpp
 LOEK += test/audio.cpp
 LOEK += test/dummy.cpp
 JARO += test/PhysicsTest.cpp
+JARO += test/ParticleTest.cpp
 
 FMT := $(JARO) #<<< CHANGE THIS TO YOUR NAME FOR STEP 2
 format: FORCE