merge conficts fixed

1 files changed, 13 insertions, 3 deletions

diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
index ae92f3d..0bb1263 100644
--- a/src/crepe/api/CMakeLists.txt
+++ b/src/crepe/api/CMakeLists.txt
@@ -3,19 +3,29 @@ target_sources(crepe PUBLIC
 	BehaviorScript.cpp
 	Script.cpp
 	GameObject.cpp
-	Collider.cpp
 	Rigidbody.cpp
+	Force.cpp
+	ParticleEmitter.cpp
+	Transform.cpp
+	Color.cpp
+	Texture.cpp
+	AssetManager.cpp
 	Sprite.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	# AudioSource.h
 	BehaviorScript.h
+	Config.h
 	Script.h
+	Script.hpp
 	GameObject.h
 	GameObject.hpp
-	Collider.h
 	Rigidbody.h
 	Sprite.h
+	Point.h
+	Color.h
+	Texture.h 
+	AssetManager.h 
+	AssetManager.hpp
 )
-