[nostalgia] Remove need for run-make and "current" symlinks

This commit is contained in:
2020-01-09 18:30:35 -06:00
parent 2fab740bf5
commit 08483e6e2f
5 changed files with 18 additions and 31 deletions

View File

@ -17,5 +17,5 @@ nost-pack -src $NOSTALGIA_PROJECT -dst $NOSTALGIA_MEDIA
padbin 32 $NOSTALGIA_BIN
ls -lh $NOSTALGIA_BIN
cat $NOSTALGIA_BIN $MEDIA_HEADER $NOSTALGIA_MEDIA > $NOSTALGIA_GBA
rm -f $MEDIA_HEADER $NOSTALGIA_MEDIA
rm -f $MEDIA_HEADER #$NOSTALGIA_MEDIA
gbafix $NOSTALGIA_GBA

View File

@ -1,8 +0,0 @@
#! /usr/bin/env bash
set -e
for f in $(find $1 -maxdepth 1 -mindepth 1 -type d)
do
cmake --build "$f" --target $2
done

View File

@ -6,10 +6,7 @@ BUILD_TYPE=$2
project=$(pwd)/
buildTool=""
if [[ $TARGET == windows ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/Mingw.cmake"
buildTool="-GNinja"
elif [[ $TARGET == gba ]]; then
if [[ $TARGET == gba ]]; then
toolchain="-DCMAKE_TOOLCHAIN_FILE=cmake/modules/GBA.cmake"
nostalgiaBuildType="-DNOSTALGIA_BUILD_TYPE=GBA"
oxUseStdLib="-DOX_USE_STDLIB=OFF"
@ -53,7 +50,6 @@ popd
rm -f build/current dist/current
mkdir -p dist
ln -s ${TARGET}-${BUILD_TYPE} build/current
echo ${TARGET}-${BUILD_TYPE} > .current_build
rm -f compile_commands.json
ln -s build/current/compile_commands.json
ln -s ${TARGET}-${BUILD_TYPE} dist/current
ln -s build/${TARGET}-${BUILD_TYPE}/compile_commands.json