drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia] Switch from Conan to bundled dep glfw

Browse Source
This commit is contained in:
Gary Talent 2022-03-11 22:16:59 -06:00
parent 3e080b95d5
commit c152bb9a66
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -42,6 +42,7 @@ endif()
add_subdirectory(deps/ox) add_subdirectory(deps/ox)
include_directories( include_directories(
SYSTEM SYSTEM
deps/glfw/include
deps/imgui/src deps/imgui/src
deps/ox/src deps/ox/src
) )
@ -49,6 +50,7 @@ include_directories(
if(BUILDCORE_TARGET STREQUAL "gba") if(BUILDCORE_TARGET STREQUAL "gba")
add_subdirectory(deps/gbastartup) add_subdirectory(deps/gbastartup)
else() else()
add_subdirectory(deps/glfw)
add_subdirectory(deps/imgui) add_subdirectory(deps/imgui)
endif() endif()

2
conanfile.py
View File

@ -2,7 +2,7 @@ from conans import ConanFile, CMake
class NostalgiaConan(ConanFile): class NostalgiaConan(ConanFile):
settings = 'os', 'compiler', 'build_type', 'arch' settings = 'os', 'compiler', 'build_type', 'arch'
requires = 'jsoncpp/1.9.4', 'glfw/3.3.4', 'imgui/1.86' requires = 'jsoncpp/1.9.4', 'imgui/1.86'
generators = 'cmake', 'cmake_find_package', 'cmake_paths' generators = 'cmake', 'cmake_find_package', 'cmake_paths'
default_options = { default_options = {
} }

3
src/nostalgia/core/CMakeLists.txt
View File

@ -1,5 +1,4 @@
if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA") if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
find_package(glfw3 REQUIRED)
find_package(imgui REQUIRED) find_package(imgui REQUIRED)
if(APPLE) if(APPLE)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
@ -18,7 +17,7 @@ if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
set( set(
NOSTALGIA_CORE_IMPL_LIBS NOSTALGIA_CORE_IMPL_LIBS
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
glfw::glfw glfw
imgui::imgui imgui::imgui
imgui-glfw imgui-glfw
NostalgiaGlUtils NostalgiaGlUtils