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

[nostalgia] Actually make Ninja usage universal...

Browse Source
This commit is contained in:
Gary Talent
2020-01-14 20:16:27 -06:00
parent 1e879b93b7
commit 33fe14ffa1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/setup-build
View File

@@ -10,8 +10,6 @@ if [[ $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
buildTool="-GNinja"
fi fi
if [[ $BUILD_TYPE == asan ]]; then if [[ $BUILD_TYPE == asan ]]; then
@@ -38,7 +36,7 @@ cmake -S $project -B $buildDir \
-DCMAKE_INSTALL_PREFIX="$distDir" \ -DCMAKE_INSTALL_PREFIX="$distDir" \
-DCMAKE_INSTALL_RPATH="$project/dist/${TARGET}-${BUILD_TYPE}/lib/nostalgia" \ -DCMAKE_INSTALL_RPATH="$project/dist/${TARGET}-${BUILD_TYPE}/lib/nostalgia" \
-DNOSTALGIA_IDE_BUILD=OFF \ -DNOSTALGIA_IDE_BUILD=OFF \
$buildTool \ -GNinja \
$nostalgiaBuildType \ $nostalgiaBuildType \
$oxUseStdLib \ $oxUseStdLib \
$BUILD_TYPEArgs \ $BUILD_TYPEArgs \