diff --git a/build.sh b/build.sh index 514a3bb..dc7aa87 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ elif [[ $UNAME == *"Darwin"* ]]; then suffix=".dylib" qt_version=$(ls /usr/local/Cellar/qt@5) export CXXFLAGS='-stdlib=libc++' - export LDFLAGS='-mmacosx-version-min=10.7' + export LDFLAGS='-mmacosx-version-min=11.0' else suffix=".so" fi diff --git a/clean.sh b/clean.sh index 7d90ecd..e9d721f 100755 --- a/clean.sh +++ b/clean.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + rm -rf simple64 rm -rf simple64-audio-sdl2/projects/unix/_obj rm -rf simple64-audio-sdl2/projects/unix/simple64-audio-sdl2.dylib diff --git a/link-mac.sh b/link-mac.sh index cb6ac2c..d87206b 100755 --- a/link-mac.sh +++ b/link-mac.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + contents=simple64/simple64-gui.app/Contents # Get files in correct directories diff --git a/pull_repos.sh b/pull_repos.sh index 3bcfe12..07758cd 100755 --- a/pull_repos.sh +++ b/pull_repos.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + git remote add mupen64plus-core https://github.com/simple64/mupen64plus-core.git git fetch mupen64plus-core git merge -s subtree mupen64plus-core/simple64 --allow-unrelated-histories --squash