fix cmake

.gitignore

@@ -4,4 +4,6 @@
 *build*/
 .idea/
 roms/
-*.bin
+*.bin
+*.sh
+.cache/

CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 project(natsukashii CXX)
 
-set(CMAKE_CXX_VERSION 17)
+set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_VERSION_REQUIRED TRUE)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 add_subdirectory(src)
 add_executable(natsukashii src/main.cpp)

src/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 add_subdirectory(core)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(FRONTEND "qt" CACHE INTERNAL "")
 
 if(${FRONTEND} MATCHES "qt")

src/core/CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.20)
 project(cores CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 add_subdirectory(gb)
 add_library(cores BaseCore.cpp BaseCore.hpp common.hpp)
 target_include_directories(cores PUBLIC .)

src/core/gb/CMakeLists.txt

@@ -1,2 +1,4 @@
 cmake_minimum_required(VERSION 3.20)
 project(gb CXX)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)

src/frontend/qt/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 project(frontend)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)

src/frontend/sdl/CMakeLists.txt

@@ -1,8 +1,10 @@
 cmake_minimum_required(VERSION 3.20)
 project(frontend)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(SDL2 REQUIRED)
 
 add_library(frontend Frontend.cpp Frontend.hpp)
 target_include_directories(frontend PUBLIC .)
-target_link_libraries(frontend PUBLIC SDL2)
+target_link_libraries(frontend PUBLIC SDL2)

src/frontend/sdl/Frontend.cpp

@@ -1,4 +1,6 @@
 #include <Frontend.hpp>
+#include <SDL2/SDL_events.h>
+#include <SDL2/SDL_video.h>
 
 namespace natsukashii::frontend {
 App::~App() {
@@ -11,5 +13,14 @@ App::App() {
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
   window = SDL_CreateWindow("natukashii", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 800, 600, SDL_WINDOW_SHOWN);
   renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+  id = SDL_GetWindowID(window);
+}
+
+void App::Run() {
+  while(!quit) {
+    SDL_Event e;
+    SDL_PollEvent(&e);
+    quit = e.type == SDL_WINDOWEVENT && e.window.event == SDL_WINDOWEVENT_CLOSE && e.window.windowID == id;
+  }
+}
 }
-}

src/frontend/sdl/Frontend.hpp

@@ -5,8 +5,11 @@ namespace natsukashii::frontend {
 struct App {
   ~App();
   App();
+  void Run();
 private:
   SDL_Window *window = nullptr;
   SDL_Renderer *renderer = nullptr;
+  Uint32 id;
+  bool quit = false;
 };
-}
+}

src/main.cpp

@@ -1,8 +1,7 @@
 #include <Frontend.hpp>
 
-using namespace natsukashii::frontend;
-
 int main() {
-  App app;
+  natsukashii::frontend::App app;
+  app.Run();
   return 0;
 }