[nostalgia] Move GlUtils out of Nostalgia

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)

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
+)

src/glutils/glutils.cpp

@@ -8,7 +8,7 @@
 
 #include "glutils.hpp"
 
-namespace nostalgia::glutils {
+namespace glutils {
 
 void deleteBuffer(GLuint b) noexcept {
 	glDeleteBuffers(1, &b);

src/glutils/glutils.hpp

@@ -4,16 +4,16 @@
 
 #pragma once
 
-#include <ox/std/bounds.hpp>
 #include <ox/std/defines.hpp>
 
 #include <glad/glad.h>
 
+#include <ox/std/bounds.hpp>
 #include <ox/std/error.hpp>
 #include <ox/std/string.hpp>
 #include <ox/std/vector.hpp>
 
-namespace nostalgia::glutils {
+namespace glutils {
 
 constexpr auto GlslVersion = "#version 330";
 

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)

src/nostalgia/core/opengl/CMakeLists.txt

@@ -7,5 +7,5 @@ target_link_libraries(
 	NostalgiaCore PUBLIC
 		glad
 		imgui
-		NostalgiaGlUtils
+		GlUtils
 )

src/nostalgia/core/opengl/context.hpp

@@ -6,7 +6,7 @@
 
 #include <ox/std/types.hpp>
 
-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>
 
 #include "gfx.hpp"
 

src/nostalgia/core/opengl/gfx.cpp

@@ -10,7 +10,7 @@
 
 #include <keel/media.hpp>
 
-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>
 
 #include <nostalgia/core/context.hpp>
 #include <nostalgia/core/gfx.hpp>

src/nostalgia/core/opengl/gfx.hpp

@@ -8,7 +8,7 @@
 
 #include <turbine/gfx.hpp>
 
-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>
 
 namespace nostalgia::core::renderer {
 

src/nostalgia/core/studio/CMakeLists.txt

@@ -21,7 +21,6 @@ target_link_libraries(
 	NostalgiaCore-Studio PUBLIC
 		NostalgiaStudio
 		NostalgiaCore
-		NostalgiaGlUtils
 		lodepng
 )
 

src/nostalgia/core/studio/paletteeditor-imgui.cpp

@@ -4,10 +4,12 @@
 
 #include <imgui.h>
 
-#include <nostalgia/core/gfx.hpp>
-#include <keel/media.hpp>
 #include <ox/std/memory.hpp>
 
+#include <keel/media.hpp>
+
+#include <nostalgia/core/gfx.hpp>
+
 #include "paletteeditor.hpp"
 #include "paletteeditor-imgui.hpp"
 

src/nostalgia/core/studio/tilesheeteditor-imgui.hpp

@@ -7,7 +7,8 @@
 #include <ox/model/def.hpp>
 #include <ox/std/vec.hpp>
 
-#include <nostalgia/glutils/glutils.hpp>
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/studio/studio.hpp>
 
 #include "tilesheetpixelgrid.hpp"

src/nostalgia/core/studio/tilesheeteditorview.hpp

@@ -7,8 +7,9 @@
 #include <ox/std/vec.hpp>
 #include <ox/model/def.hpp>
 
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>
 
 #include "tilesheeteditormodel.hpp"

src/nostalgia/core/studio/tilesheetpixelgrid.hpp

@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>
 
 namespace nostalgia::core {

src/nostalgia/core/studio/tilesheetpixels.hpp

@@ -6,8 +6,9 @@
 
 #include <ox/std/vec.hpp>
 
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/studio/studio.hpp>
 
 namespace nostalgia::core {

src/nostalgia/glutils/CMakeLists.txt

@@ -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
-)

src/nostalgia/scene/studio/CMakeLists.txt

@@ -12,7 +12,6 @@ endif()
 
 target_link_libraries(
 	NostalgiaScene-Studio PUBLIC
-		NostalgiaGlUtils
 		NostalgiaStudio
 		NostalgiaScene
 )

src/nostalgia/scene/studio/sceneeditorview.hpp

@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include <glutils/glutils.hpp>
+
 #include <nostalgia/core/gfx.hpp>
-#include <nostalgia/glutils/glutils.hpp>
 #include <nostalgia/scene/scene.hpp>
 
 namespace nostalgia::scene {