From eed1a1a94e2823422a952c39074d591ace4d3f8d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 20 Jun 2019 07:50:12 -0500 Subject: [PATCH] [nostalgia] Fix GBA build to use altered CMake modules path --- mg.yml | 4 ++-- scripts/setup-build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mg.yml b/mg.yml index 336593d8..a3dbf15d 100644 --- a/mg.yml +++ b/mg.yml @@ -26,10 +26,10 @@ cmake: windows: env: nostalgia_devenv defs: - CMAKE_TOOLCHAIN_FILE: cmake/Modules/Mingw.cmake + CMAKE_TOOLCHAIN_FILE: cmake/modules/Mingw.cmake gba: env: nostalgia_devenv defs: - CMAKE_TOOLCHAIN_FILE: cmake/Modules/GBA.cmake + CMAKE_TOOLCHAIN_FILE: cmake/modules/GBA.cmake NOSTALGIA_BUILD_TYPE: GBA OX_USE_STDLIB: OFF diff --git a/scripts/setup-build b/scripts/setup-build index 49dae9d9..50857bbd 100755 --- a/scripts/setup-build +++ b/scripts/setup-build @@ -7,10 +7,10 @@ project=$(pwd)/ buildTool="" if [[ $TARGET == windows ]]; then - toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake" + toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/Mingw.cmake" buildTool="-GNinja" 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" oxUseStdLib="-DOX_USE_STDLIB=OFF" else