From 0b6254a4fbe3228abf1756a14931b8d5abe0df12 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 7 Feb 2018 21:29:57 -0600 Subject: [PATCH] Fix setup-build.ps1 for GBA builds --- scripts/setup-build.ps1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/setup-build.ps1 b/scripts/setup-build.ps1 index 8517c8fb..ce7ec4e9 100755 --- a/scripts/setup-build.ps1 +++ b/scripts/setup-build.ps1 @@ -10,7 +10,9 @@ $project=(Get-Location).Path if (${target} -eq "windows") { $toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake" } elseif (${target} -eq "gba") { - $toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake -DNOSTALGIA_BUILD_TYPE=GBA -DOX_USE_STDLIB=OFF" + $toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake" + $nostalgiaBuildType="-DNOSTALGIA_BUILD_TYPE=GBA" + $oxUseStdLib="-DOX_USE_STDLIB=OFF" } if (${buildType} -eq "asan") { @@ -35,6 +37,8 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ` -DCMAKE_INSTALL_RPATH="$project/dist/${target}-${buildType}/lib/nostalgia" ` -DNOSTALGIA_IDE_BUILD=OFF ` $buildTool ` + $nostalgiaBuildType ` + $oxUseStdLib ` $buildTypeArgs ` $qtPath ` $toolchain `