From 8cd2ef2d8bf9eb7ac3d36f99126ea93e8464251c Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 1 Jun 2023 23:58:39 -0500 Subject: [PATCH] [nostalgia] Move GlUtils out of Nostalgia --- src/CMakeLists.txt | 3 +++ src/glutils/CMakeLists.txt | 21 +++++++++++++++++++ src/{nostalgia => }/glutils/glutils.cpp | 2 +- src/{nostalgia => }/glutils/glutils.hpp | 4 ++-- src/nostalgia/CMakeLists.txt | 1 - src/nostalgia/core/opengl/CMakeLists.txt | 2 +- src/nostalgia/core/opengl/context.hpp | 2 +- src/nostalgia/core/opengl/gfx.cpp | 2 +- src/nostalgia/core/opengl/gfx.hpp | 2 +- src/nostalgia/core/studio/CMakeLists.txt | 1 - .../core/studio/paletteeditor-imgui.cpp | 6 ++++-- .../core/studio/tilesheeteditor-imgui.hpp | 3 ++- .../core/studio/tilesheeteditorview.hpp | 3 ++- .../core/studio/tilesheetpixelgrid.hpp | 3 ++- src/nostalgia/core/studio/tilesheetpixels.hpp | 3 ++- src/nostalgia/glutils/CMakeLists.txt | 21 ------------------- src/nostalgia/scene/studio/CMakeLists.txt | 1 - .../scene/studio/sceneeditorview.hpp | 3 ++- 18 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 src/glutils/CMakeLists.txt rename src/{nostalgia => }/glutils/glutils.cpp (99%) rename src/{nostalgia => }/glutils/glutils.hpp (99%) delete mode 100644 src/nostalgia/glutils/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8615a62d..fdb87f6ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,8 @@ include_directories(".") +if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") + add_subdirectory(glutils) +endif() add_subdirectory(keel) add_subdirectory(nostalgia) add_subdirectory(turbine) \ No newline at end of file diff --git a/src/glutils/CMakeLists.txt b/src/glutils/CMakeLists.txt new file mode 100644 index 000000000..e17d21f4b --- /dev/null +++ b/src/glutils/CMakeLists.txt @@ -0,0 +1,21 @@ +add_library( + GlUtils OBJECT + glutils.cpp +) + +if(NOT MSVC) + target_compile_options(GlUtils PRIVATE -Wsign-conversion) +endif() + +target_link_libraries( + GlUtils PUBLIC + OxStd + glad +) + +install( + FILES + glutils.hpp + DESTINATION + include/glutils +) diff --git a/src/nostalgia/glutils/glutils.cpp b/src/glutils/glutils.cpp similarity index 99% rename from src/nostalgia/glutils/glutils.cpp rename to src/glutils/glutils.cpp index 6e4c7404f..9715732f5 100644 --- a/src/nostalgia/glutils/glutils.cpp +++ b/src/glutils/glutils.cpp @@ -8,7 +8,7 @@ #include "glutils.hpp" -namespace nostalgia::glutils { +namespace glutils { void deleteBuffer(GLuint b) noexcept { glDeleteBuffers(1, &b); diff --git a/src/nostalgia/glutils/glutils.hpp b/src/glutils/glutils.hpp similarity index 99% rename from src/nostalgia/glutils/glutils.hpp rename to src/glutils/glutils.hpp index f59a168d8..19ea49bc7 100644 --- a/src/nostalgia/glutils/glutils.hpp +++ b/src/glutils/glutils.hpp @@ -4,16 +4,16 @@ #pragma once -#include #include #include +#include #include #include #include -namespace nostalgia::glutils { +namespace glutils { constexpr auto GlslVersion = "#version 330"; diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt index ca1baa124..221b861a7 100644 --- a/src/nostalgia/CMakeLists.txt +++ b/src/nostalgia/CMakeLists.txt @@ -10,7 +10,6 @@ if(NOSTALGIA_BUILD_PLAYER) endif() if(NOSTALGIA_BUILD_TYPE STREQUAL "Native") - add_subdirectory(glutils) add_subdirectory(tools) if(NOSTALGIA_BUILD_STUDIO) add_subdirectory(studio) diff --git a/src/nostalgia/core/opengl/CMakeLists.txt b/src/nostalgia/core/opengl/CMakeLists.txt index c65586640..7b04375c9 100644 --- a/src/nostalgia/core/opengl/CMakeLists.txt +++ b/src/nostalgia/core/opengl/CMakeLists.txt @@ -7,5 +7,5 @@ target_link_libraries( NostalgiaCore PUBLIC glad imgui - NostalgiaGlUtils + GlUtils ) diff --git a/src/nostalgia/core/opengl/context.hpp b/src/nostalgia/core/opengl/context.hpp index dfe0b374b..360e6f980 100644 --- a/src/nostalgia/core/opengl/context.hpp +++ b/src/nostalgia/core/opengl/context.hpp @@ -6,7 +6,7 @@ #include -#include +#include #include "gfx.hpp" diff --git a/src/nostalgia/core/opengl/gfx.cpp b/src/nostalgia/core/opengl/gfx.cpp index e11942a4b..4c498b418 100644 --- a/src/nostalgia/core/opengl/gfx.cpp +++ b/src/nostalgia/core/opengl/gfx.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/src/nostalgia/core/opengl/gfx.hpp b/src/nostalgia/core/opengl/gfx.hpp index 36114bf2a..b5c26f2d3 100644 --- a/src/nostalgia/core/opengl/gfx.hpp +++ b/src/nostalgia/core/opengl/gfx.hpp @@ -8,7 +8,7 @@ #include -#include +#include namespace nostalgia::core::renderer { diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/core/studio/CMakeLists.txt index b4783ea0b..f66f6e47a 100644 --- a/src/nostalgia/core/studio/CMakeLists.txt +++ b/src/nostalgia/core/studio/CMakeLists.txt @@ -21,7 +21,6 @@ target_link_libraries( NostalgiaCore-Studio PUBLIC NostalgiaStudio NostalgiaCore - NostalgiaGlUtils lodepng ) diff --git a/src/nostalgia/core/studio/paletteeditor-imgui.cpp b/src/nostalgia/core/studio/paletteeditor-imgui.cpp index 119cc5d46..a5425c5d2 100644 --- a/src/nostalgia/core/studio/paletteeditor-imgui.cpp +++ b/src/nostalgia/core/studio/paletteeditor-imgui.cpp @@ -4,10 +4,12 @@ #include -#include -#include #include +#include + +#include + #include "paletteeditor.hpp" #include "paletteeditor-imgui.hpp" diff --git a/src/nostalgia/core/studio/tilesheeteditor-imgui.hpp b/src/nostalgia/core/studio/tilesheeteditor-imgui.hpp index 065b6c816..3f21fb134 100644 --- a/src/nostalgia/core/studio/tilesheeteditor-imgui.hpp +++ b/src/nostalgia/core/studio/tilesheeteditor-imgui.hpp @@ -7,7 +7,8 @@ #include #include -#include +#include + #include #include "tilesheetpixelgrid.hpp" diff --git a/src/nostalgia/core/studio/tilesheeteditorview.hpp b/src/nostalgia/core/studio/tilesheeteditorview.hpp index 2437a07e3..7c2980161 100644 --- a/src/nostalgia/core/studio/tilesheeteditorview.hpp +++ b/src/nostalgia/core/studio/tilesheeteditorview.hpp @@ -7,8 +7,9 @@ #include #include +#include + #include -#include #include #include "tilesheeteditormodel.hpp" diff --git a/src/nostalgia/core/studio/tilesheetpixelgrid.hpp b/src/nostalgia/core/studio/tilesheetpixelgrid.hpp index 4433e12c7..3e77b7864 100644 --- a/src/nostalgia/core/studio/tilesheetpixelgrid.hpp +++ b/src/nostalgia/core/studio/tilesheetpixelgrid.hpp @@ -4,8 +4,9 @@ #pragma once +#include + #include -#include #include namespace nostalgia::core { diff --git a/src/nostalgia/core/studio/tilesheetpixels.hpp b/src/nostalgia/core/studio/tilesheetpixels.hpp index dbc042c85..8729e4d67 100644 --- a/src/nostalgia/core/studio/tilesheetpixels.hpp +++ b/src/nostalgia/core/studio/tilesheetpixels.hpp @@ -6,8 +6,9 @@ #include +#include + #include -#include #include namespace nostalgia::core { diff --git a/src/nostalgia/glutils/CMakeLists.txt b/src/nostalgia/glutils/CMakeLists.txt deleted file mode 100644 index f89b12f2c..000000000 --- a/src/nostalgia/glutils/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -add_library( - NostalgiaGlUtils OBJECT - glutils.cpp -) - -if(NOT MSVC) - target_compile_options(NostalgiaGlUtils PRIVATE -Wsign-conversion) -endif() - -target_link_libraries( - NostalgiaGlUtils PUBLIC - OxStd - glad -) - -install( - FILES - glutils.hpp - DESTINATION - include/nostalgia/glutils -) diff --git a/src/nostalgia/scene/studio/CMakeLists.txt b/src/nostalgia/scene/studio/CMakeLists.txt index 1aa7d323d..ff87d409a 100644 --- a/src/nostalgia/scene/studio/CMakeLists.txt +++ b/src/nostalgia/scene/studio/CMakeLists.txt @@ -12,7 +12,6 @@ endif() target_link_libraries( NostalgiaScene-Studio PUBLIC - NostalgiaGlUtils NostalgiaStudio NostalgiaScene ) diff --git a/src/nostalgia/scene/studio/sceneeditorview.hpp b/src/nostalgia/scene/studio/sceneeditorview.hpp index ab8135d4f..1c6f3af58 100644 --- a/src/nostalgia/scene/studio/sceneeditorview.hpp +++ b/src/nostalgia/scene/studio/sceneeditorview.hpp @@ -4,8 +4,9 @@ #pragma once +#include + #include -#include #include namespace nostalgia::scene {