diff --git a/include/Game/FPSCounter.h b/include/Game/GUI/FPSCounter.h similarity index 100% rename from include/Game/FPSCounter.h rename to include/Game/GUI/FPSCounter.h diff --git a/include/Game/HUD.h b/include/Game/GUI/HUD.h similarity index 100% rename from include/Game/HUD.h rename to include/Game/GUI/HUD.h diff --git a/include/Game/MainMenu.h b/include/Game/GUI/MainMenu.h similarity index 90% rename from include/Game/MainMenu.h rename to include/Game/GUI/MainMenu.h index fa629d3..0cbc950 100644 --- a/include/Game/MainMenu.h +++ b/include/Game/GUI/MainMenu.h @@ -2,8 +2,8 @@ #define GUI_MAINMENU_H__ #include "GUI/TextureFrame.h" -#include "Game/MainMenuMain.h" -#include "Game/MainMenuOptions.h" +#include "Game/GUI/MainMenuMain.h" +#include "Game/GUI/MainMenuOptions.h" #include "Core/EKeyUp.h" namespace dd diff --git a/include/Game/MainMenuMain.h b/include/Game/GUI/MainMenuMain.h similarity index 95% rename from include/Game/MainMenuMain.h rename to include/Game/GUI/MainMenuMain.h index c74027f..7c951b6 100644 --- a/include/Game/MainMenuMain.h +++ b/include/Game/GUI/MainMenuMain.h @@ -4,7 +4,7 @@ #include "GUI/TextureFrame.h" #include "GUI/Button.h" #include "Game/EGameStart.h" -#include "Game/HUD.h" +#include "Game/GUI/HUD.h" namespace dd { diff --git a/include/Game/MainMenuOptions.h b/include/Game/GUI/MainMenuOptions.h similarity index 100% rename from include/Game/MainMenuOptions.h rename to include/Game/GUI/MainMenuOptions.h diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index b4fe3b4..2552cb9 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -70,6 +70,11 @@ file(GLOB SOURCE_FILES_Game "Game/*.cpp" ) source_group(Game FILES ${SOURCE_FILES_Game}) +file(GLOB SOURCE_FILES_Game_GUI + "${INCLUDE_PATH}/Game/GUI/*.h" + "Game/GUI/*.cpp" +) +source_group(Game\\GUI FILES ${SOURCE_FILES_Game_GUI}) file(GLOB SOURCE_FILES_Sound "${INCLUDE_PATH}/Sound/*.h" @@ -91,8 +96,10 @@ set(SOURCE_FILES ${SOURCE_FILES_Transform} ${SOURCE_FILES_Physics} ${SOURCE_FILES_Game} + ${SOURCE_FILES_Game_GUI} ${SOURCE_FILES_Sound} - ${SOURCE_FILES_GUI}) + ${SOURCE_FILES_GUI} +) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")