[glutils] Move glutils to deps
This commit is contained in:
parent
e2545a956b
commit
debeb83119
@ -69,6 +69,7 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
|
|||||||
set(GLFW_BUILD_TESTS OFF)
|
set(GLFW_BUILD_TESTS OFF)
|
||||||
set(GLFW_BUILD_DOCS OFF)
|
set(GLFW_BUILD_DOCS OFF)
|
||||||
add_subdirectory(deps/glfw)
|
add_subdirectory(deps/glfw)
|
||||||
|
add_subdirectory(deps/glutils)
|
||||||
add_subdirectory(deps/imgui)
|
add_subdirectory(deps/imgui)
|
||||||
add_subdirectory(deps/lodepng)
|
add_subdirectory(deps/lodepng)
|
||||||
add_subdirectory(deps/nfde)
|
add_subdirectory(deps/nfde)
|
||||||
|
10
deps/glutils/CMakeLists.txt
vendored
Normal file
10
deps/glutils/CMakeLists.txt
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
project(GlUtils CXX)
|
||||||
|
|
||||||
|
add_subdirectory(src)
|
||||||
|
|
||||||
|
install(
|
||||||
|
DIRECTORY
|
||||||
|
include/glutils
|
||||||
|
DESTINATION
|
||||||
|
include
|
||||||
|
)
|
@ -3,23 +3,21 @@ add_library(
|
|||||||
glutils.cpp
|
glutils.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_include_directories(
|
||||||
|
GlUtils PUBLIC
|
||||||
|
../include
|
||||||
|
)
|
||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
GlUtils PUBLIC
|
GlUtils PUBLIC
|
||||||
OxStd
|
OxStd
|
||||||
glad
|
glad
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
glutils.hpp
|
|
||||||
DESTINATION
|
|
||||||
include/glutils
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
install(
|
||||||
TARGETS
|
TARGETS
|
||||||
GlUtils
|
GlUtils
|
||||||
DESTINATION
|
DESTINATION
|
||||||
LIBRARY DESTINATION lib
|
LIBRARY DESTINATION lib
|
||||||
ARCHIVE DESTINATION lib
|
ARCHIVE DESTINATION lib
|
||||||
)
|
)
|
@ -6,7 +6,7 @@
|
|||||||
#include <ox/std/bstring.hpp>
|
#include <ox/std/bstring.hpp>
|
||||||
#include <ox/std/trace.hpp>
|
#include <ox/std/trace.hpp>
|
||||||
|
|
||||||
#include "glutils.hpp"
|
#include "glutils/glutils.hpp"
|
||||||
|
|
||||||
namespace glutils {
|
namespace glutils {
|
||||||
|
|
@ -2,8 +2,5 @@ include_directories(".")
|
|||||||
|
|
||||||
set(OLYMPIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/olympic")
|
set(OLYMPIC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/olympic")
|
||||||
|
|
||||||
if(TURBINE_BUILD_TYPE STREQUAL "Native")
|
|
||||||
add_subdirectory(glutils)
|
|
||||||
endif()
|
|
||||||
add_subdirectory(nostalgia)
|
add_subdirectory(nostalgia)
|
||||||
add_subdirectory(olympic)
|
add_subdirectory(olympic)
|
||||||
|
Loading…
Reference in New Issue
Block a user