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

[nostalgia] Remove conan from main CMakeLists.txt, remove glfw & imgui includes from GBA build

Browse Source
This commit is contained in:
Gary Talent 2022-03-12 02:36:32 -06:00
parent 52df6efcfc
commit 3a5a4894c0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -1,7 +1,11 @@
cmake_minimum_required(VERSION 3.19) cmake_minimum_required(VERSION 3.19)
set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
project(nostalgia) if(APPLE)
project(nostalgia CXX OBJCXX)
else()
project(nostalgia CXX)
endif()
include(deps/buildcore/base.cmake) include(deps/buildcore/base.cmake)
@ -15,10 +19,6 @@ if(BUILDCORE_TARGET STREQUAL "gba")
include(deps/gbabuildcore/base.cmake) include(deps/gbabuildcore/base.cmake)
else() else()
set(NOSTALGIA_BUILD_TYPE "Native") set(NOSTALGIA_BUILD_TYPE "Native")
set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake)
if(EXISTS ${NOSTALGIA_CONAN_PATHS})
include(${NOSTALGIA_CONAN_PATHS})
endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif() endif()
@ -42,14 +42,18 @@ endif()
add_subdirectory(deps/ox) add_subdirectory(deps/ox)
include_directories( include_directories(
SYSTEM SYSTEM
deps/glfw/include
deps/imgui/src
deps/ox/src deps/ox/src
) )
if(BUILDCORE_TARGET STREQUAL "gba") if(BUILDCORE_TARGET STREQUAL "gba")
add_subdirectory(deps/gbastartup) add_subdirectory(deps/gbastartup)
else() else()
include_directories(
SYSTEM
deps/glfw/include
deps/imgui
deps/imgui/backends
)
add_subdirectory(deps/glfw) add_subdirectory(deps/glfw)
add_subdirectory(deps/imgui) add_subdirectory(deps/imgui)
endif() endif()