diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-11-15 14:32:09 +0100 |
| commit | 37c016f1d5902cf7bbfed08d13ee2bc6ef725add (patch) | |
| tree | ce9de85b6d5ffd43d2e798b5310df883705f5ca8 /src/crepe/api/CMakeLists.txt | |
| parent | de1c6053033483c7e824f8018d75be6af424d14d (diff) | |
| parent | 337a957a9e605f16287506b6afda56950e562db3 (diff) | |
merge with wouter/events
Diffstat (limited to 'src/crepe/api/CMakeLists.txt')
| -rw-r--r-- | src/crepe/api/CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index de1b4b3..07341e2 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -18,13 +18,14 @@ target_sources(crepe PUBLIC Vector2.cpp Camera.cpp Animator.cpp -<<<<<<< HEAD BoxCollider.cpp CircleCollider.cpp -======= + EventManager.cpp + EventHandler.cpp + IKeyListener.cpp + IMouseListener.cpp LoopManager.cpp LoopTimer.cpp ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 ) target_sources(crepe PUBLIC FILE_SET HEADERS FILES @@ -49,11 +50,14 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES SceneManager.hpp Camera.h Animator.h -<<<<<<< HEAD BoxCollider.h CircleCollider.h -======= + EventManager.h + EventManager.hpp + EventHandler.h + Event.h + IKeyListener.h + IMouseListener.h LoopManager.h LoopTimer.h ->>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 ) |