merge

1 files changed, 7 insertions, 40 deletions

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index fbbe901..ece2a40 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -8,19 +8,18 @@ set(CMAKE_BUILD_TYPE Debug)
 project(game C CXX)
 
 add_subdirectory(../src crepe)
-
-set(SOURCES
-	AquariumSubScene.cpp
-	BackgroundSubScene.cpp
-	ForestParallaxScript.cpp
-	ForestSubScene.cpp
+add_executable(main
+	background/AquariumSubScene.cpp
+	background/BackgroundSubScene.cpp
+	background/ForestParallaxScript.cpp
+	background/ForestSubScene.cpp
 	GameScene.cpp
-	HallwaySubScene.cpp
+	background/HallwaySubScene.cpp
 	MoveCameraManualyScript.cpp
 	PlayerScript.cpp
 	PlayerSubScene.cpp
 	StartGameScript.cpp
-	StartSubScene.cpp
+	background/StartSubScene.cpp
 	main.cpp
 	mainmenu/IButtonScript.cpp
 	mainmenu/ButtonSubScene.cpp
@@ -38,37 +37,5 @@ set(SOURCES
 	coins/CoinScript.cpp
 )
 
-set(HEADERS
-	AquariumSubScene.h
-	BackgroundSubScene.h
-	ForestParallaxScript.h
-	ForestSubScene.h
-	GameScene.h
-	HallwaySubScene.h
-	MoveCameraManualyScript.h
-	PlayerScript.h
-	PlayerSubScene.h
-	StartGameScript.h
-	StartSubScene.h
-	mainmenu/IButtonScript.h
-	mainmenu/ButtonSubScene.h
-	mainmenu/MainMenuScene.h
-	mainmenu/MainMenuConfig.h
-	mainmenu/ITransitionScript.h
-	mainmenu/TransitionStartScript.h
-	mainmenu/ButtonTransitionPreviewScript.h
-	mainmenu/ShopMenuScene.h
-	mainmenu/BannerSubScene.h
-	mainmenu/ButtonSetShopScript.h
-	mainmenu/ButtonSetMainMenuScript.h
-	coins/CoinData.h
-	coins/CoinSubScene.h
-	coins/CoinPool.h
-	coins/CoinSystemScript.h
-	coins/CoinScript.h
-)
-
-add_executable(main ${SOURCES} ${HEADERS})
-
 target_link_libraries(main PUBLIC crepe)