diff --git a/.gitignore b/.gitignore index 354231ec..eeb21870 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ Makefile.local .DS_Store .LSOverride Icon? -make-macosx-values.sh +make-macosx-values.local # Xcode #################### diff --git a/code/sys/sys_osx.m b/code/sys/sys_osx.m index 1b3796fb..b0ecf6a5 100644 --- a/code/sys/sys_osx.m +++ b/code/sys/sys_osx.m @@ -49,10 +49,10 @@ dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *t [alert setMessageText: [NSString stringWithUTF8String: title]]; [alert setInformativeText: [NSString stringWithUTF8String: message]]; - if( type == DT_ERROR ) - [alert setAlertStyle: NSCriticalAlertStyle]; - else - [alert setAlertStyle: NSWarningAlertStyle]; + if( type == DT_ERROR ) + [alert setAlertStyle: NSCriticalAlertStyle]; + else + [alert setAlertStyle: NSWarningAlertStyle]; switch( type ) { diff --git a/make-macosx-ub2.sh b/make-macosx-ub2.sh index 95f39fef..8df5499d 100755 --- a/make-macosx-ub2.sh +++ b/make-macosx-ub2.sh @@ -1,5 +1,4 @@ #!/bin/bash -CC=gcc-4.0 cd `dirname $0` if [ ! -f Makefile ]; then @@ -24,7 +23,7 @@ echo "Building X86_64 Client/Dedicated Server" echo "Building ARM64 Client/Dedicated Server" echo -if [ $1 == "" ]; then +if [ "$1" == "" ]; then echo "Run script with a 'notarize' flag to perform signing and notarization." fi @@ -59,7 +58,7 @@ fi if [ "$1" == "notarize" ]; then # user-specific values - # specify the actual values in a separate file called make-macosx-values.sh + # specify the actual values in a separate file called make-macosx-values.local # **************************************************************************************** # identity as specified in Keychain @@ -75,7 +74,7 @@ if [ "$1" == "notarize" ]; then ASC_PROVIDER="XXXXXXXXX" # **************************************************************************************** - source make-macosx-values.sh + source make-macosx-values.local # release build location RELEASE_LOCATION="build/release-darwin-universal2" diff --git a/make-macosx.sh b/make-macosx.sh index 81df929c..460e09b3 100755 --- a/make-macosx.sh +++ b/make-macosx.sh @@ -22,7 +22,7 @@ elif [ "$1" == "arm64" ]; then BUILDARCH=arm64 else echo "Invalid architecture: $1" - echo "Valid architectures are x86, x86_64, arm64 or ppc" + echo "Valid architectures are arm64, x86_64, x86, or ppc" exit 1 fi diff --git a/misc/xcode/xcode-readme.txt b/misc/xcode/xcode-readme.txt index b8cb85aa..063f0433 100644 --- a/misc/xcode/xcode-readme.txt +++ b/misc/xcode/xcode-readme.txt @@ -46,6 +46,5 @@ TODO: - NO CARRIER