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

[nostalgia] Fix GBA build to use altered CMake modules path

Browse Source
This commit is contained in:
Gary Talent 2019-06-20 07:50:12 -05:00
parent 9c70aab4a6
commit eed1a1a94e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mg.yml
View File

@ -26,10 +26,10 @@ cmake:
windows: windows:
env: nostalgia_devenv env: nostalgia_devenv
defs: defs:
CMAKE_TOOLCHAIN_FILE: cmake/Modules/Mingw.cmake CMAKE_TOOLCHAIN_FILE: cmake/modules/Mingw.cmake
gba: gba:
env: nostalgia_devenv env: nostalgia_devenv
defs: defs:
CMAKE_TOOLCHAIN_FILE: cmake/Modules/GBA.cmake CMAKE_TOOLCHAIN_FILE: cmake/modules/GBA.cmake
NOSTALGIA_BUILD_TYPE: GBA NOSTALGIA_BUILD_TYPE: GBA
OX_USE_STDLIB: OFF OX_USE_STDLIB: OFF

4
scripts/setup-build
View File

@ -7,10 +7,10 @@ project=$(pwd)/
buildTool="" buildTool=""
if [[ $TARGET == windows ]]; then if [[ $TARGET == windows ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake" toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/Mingw.cmake"
buildTool="-GNinja" buildTool="-GNinja"
elif [[ $TARGET == gba ]]; then elif [[ $TARGET == gba ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake" toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/GBA.cmake"
nostalgiaBuildType="-DNOSTALGIA_BUILD_TYPE=GBA" nostalgiaBuildType="-DNOSTALGIA_BUILD_TYPE=GBA"
oxUseStdLib="-DOX_USE_STDLIB=OFF" oxUseStdLib="-DOX_USE_STDLIB=OFF"
else else