housekeeping
This commit is contained in:
@@ -1,22 +1,21 @@
|
|||||||
#ifndef YAZE_APPLICATION_CORE_CONTROLLER_H
|
#ifndef YAZE_APPLICATION_CORE_CONTROLLER_H
|
||||||
#define YAZE_APPLICATION_CORE_CONTROLLER_H
|
#define YAZE_APPLICATION_CORE_CONTROLLER_H
|
||||||
|
#define SDL_MAIN_HANDLED
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
|
|
||||||
#include "imgui/imgui.h"
|
#include <memory>
|
||||||
#include "imgui/imgui_internal.h"
|
|
||||||
|
#include "Events/Event.h"
|
||||||
|
#include "Renderer.h"
|
||||||
|
#include "Editor/Editor.h"
|
||||||
|
#include "Window.h"
|
||||||
#include "imgui/backends/imgui_impl_sdl.h"
|
#include "imgui/backends/imgui_impl_sdl.h"
|
||||||
#include "imgui/backends/imgui_impl_sdlrenderer.h"
|
#include "imgui/backends/imgui_impl_sdlrenderer.h"
|
||||||
|
#include "imgui/imgui.h"
|
||||||
|
#include "imgui/imgui_internal.h"
|
||||||
#include "imgui/misc/cpp/imgui_stdlib.h"
|
#include "imgui/misc/cpp/imgui_stdlib.h"
|
||||||
|
|
||||||
#include "Window.h"
|
|
||||||
#include "Renderer.h"
|
|
||||||
#include "Events/Event.h"
|
|
||||||
#include "View/Editor.h"
|
|
||||||
#include "View/Debug.h"
|
|
||||||
|
|
||||||
int main(int argc, char** argv);
|
int main(int argc, char** argv);
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
@@ -38,7 +37,6 @@ class Controller {
|
|||||||
private:
|
private:
|
||||||
Window window;
|
Window window;
|
||||||
Renderer renderer;
|
Renderer renderer;
|
||||||
View::Debug debug;
|
|
||||||
View::Editor editor;
|
View::Editor editor;
|
||||||
bool active = false;
|
bool active = false;
|
||||||
void quit() { active = false; }
|
void quit() { active = false; }
|
||||||
|
|||||||
@@ -1,9 +1,3 @@
|
|||||||
|
|
||||||
# Boost library --------------------------------------------------------------------------------------------------
|
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
|
||||||
find_package(Boost REQUIRED)
|
|
||||||
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
|
|
||||||
|
|
||||||
# SDL libraries --------------------------------------------------------------------------------------------------
|
# SDL libraries --------------------------------------------------------------------------------------------------
|
||||||
find_package(SDL2 REQUIRED)
|
find_package(SDL2 REQUIRED)
|
||||||
|
|
||||||
@@ -31,9 +25,11 @@ add_executable(
|
|||||||
Application/Core/Renderer.cc
|
Application/Core/Renderer.cc
|
||||||
Application/Core/Window.cc
|
Application/Core/Window.cc
|
||||||
Application/Data/Overworld.cc
|
Application/Data/Overworld.cc
|
||||||
|
Application/Data/OverworldMap.cc
|
||||||
|
Application/Data/Tile.cc
|
||||||
|
Application/Editor/Editor.cc
|
||||||
Application/Events/Event.cc
|
Application/Events/Event.cc
|
||||||
Application/View/Debug.cc
|
Application/Graphics/Bitmap.cc
|
||||||
Application/View/Editor.cc
|
|
||||||
Application/Utils/Compression.cc
|
Application/Utils/Compression.cc
|
||||||
Application/Utils/ROM.cc
|
Application/Utils/ROM.cc
|
||||||
# GUI libraries
|
# GUI libraries
|
||||||
@@ -55,7 +51,6 @@ target_include_directories(
|
|||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
yaze
|
yaze
|
||||||
${BOOST_LIBRARIES}
|
|
||||||
${SDL2_LIBRARIES}
|
${SDL2_LIBRARIES}
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
ImGui
|
ImGui
|
||||||
|
|||||||
Reference in New Issue
Block a user