From 1f655571685b441e993247074c01f2fd84143358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 8 Aug 2023 12:11:37 +0200 Subject: [PATCH] Fix mac bundle version string. On mac, the git-version.cpp to look at at bundle time is the one in build. --- SDL/macbundle.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/SDL/macbundle.sh b/SDL/macbundle.sh index 9c67205efc..5ab0ce1a34 100755 --- a/SDL/macbundle.sh +++ b/SDL/macbundle.sh @@ -35,11 +35,7 @@ install_name_tool -rpath "${RPATH}" "@executable_path/../Frameworks" "${PPSSPPSD echo "Done." -GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../git-version.cpp") -# Hack, need to do something better here. -if [ -z "$GIT_VERSION_LINE" ]; then - GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../build/git-version.cpp") -fi +GIT_VERSION_LINE=$(grep "PPSSPP_GIT_VERSION = " "$(dirname "${0}")/../build/git-version.cpp") echo "Setting version to '${GIT_VERSION_LINE}'..." SHORT_VERSION_MATCH='.*"v([0-9\.]+(-[0-9]+)?).*";'