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

[nostalgia] Remove Conan setup for GBA builds

Browse Source
This commit is contained in:
Gary Talent 2021-03-28 00:58:15 -05:00
parent 504c41fabc
commit 1c81b2aba8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -18,11 +18,11 @@ endif()
if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
set(OX_BARE_METAL ON) set(OX_BARE_METAL ON)
endif() else()
set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake)
set(NOSTALGIA_CONAN_PATHS ${CMAKE_SOURCE_DIR}/.conanbuild/conan_paths.cmake) if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA" AND EXISTS ${NOSTALGIA_CONAN_PATHS})
if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA" AND EXISTS ${NOSTALGIA_CONAN_PATHS}) include(${NOSTALGIA_CONAN_PATHS})
include(${NOSTALGIA_CONAN_PATHS}) endif()
endif() endif()
if(OX_BARE_METAL) if(OX_BARE_METAL)