merge conficts fixed

1 files changed, 15 insertions, 0 deletions

diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index cfa51fb..d938eb8 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -2,20 +2,35 @@ target_sources(crepe PUBLIC
 	Asset.cpp
 	Sound.cpp
 	SoundContext.cpp
+	Particle.cpp
+	ParticleSystem.cpp
+	SDLApp.cpp
 	ComponentManager.cpp
 	Component.cpp
 	ScriptSystem.cpp
+	PhysicsSystem.cpp
+	CollisionSystem.cpp
+	Collider.cpp
+	SDLContext.cpp
+
+	RenderSystem.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	Asset.h
 	Sound.h
 	SoundContext.h
+	SDLContext.h
 	ComponentManager.h
 	ComponentManager.hpp
 	Component.h
 	System.h
 	ScriptSystem.h
+	PhysicsSystem.h
+	CollisionSystem.h
+	Collider.h
+	SDLContext.h
+	RenderSystem.h
 )
 
 add_subdirectory(api)