ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Addressed PR suggestions

Browse source
This commit is contained in:
Tom Kidd 2021-10-22 10:00:20 -05:00
parent 2fef57fffa
commit 3d06d07516
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -13,7 +13,7 @@ Makefile.local
.DS_Store .DS_Store
.LSOverride .LSOverride
Icon? Icon?
make-macosx-values.sh make-macosx-values.local
# Xcode # Xcode
#################### ####################

8
code/sys/sys_osx.m
View file

@ -49,10 +49,10 @@ dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *t
[alert setMessageText: [NSString stringWithUTF8String: title]]; [alert setMessageText: [NSString stringWithUTF8String: title]];
[alert setInformativeText: [NSString stringWithUTF8String: message]]; [alert setInformativeText: [NSString stringWithUTF8String: message]];
if( type == DT_ERROR ) if( type == DT_ERROR )
[alert setAlertStyle: NSCriticalAlertStyle]; [alert setAlertStyle: NSCriticalAlertStyle];
else else
[alert setAlertStyle: NSWarningAlertStyle]; [alert setAlertStyle: NSWarningAlertStyle];
switch( type ) switch( type )
{ {

7
make-macosx-ub2.sh
View file

@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
CC=gcc-4.0
cd `dirname $0` cd `dirname $0`
if [ ! -f Makefile ]; then if [ ! -f Makefile ]; then
@ -24,7 +23,7 @@ echo "Building X86_64 Client/Dedicated Server"
echo "Building ARM64 Client/Dedicated Server" echo "Building ARM64 Client/Dedicated Server"
echo echo
if [ $1 == "" ]; then if [ "$1" == "" ]; then
echo "Run script with a 'notarize' flag to perform signing and notarization." echo "Run script with a 'notarize' flag to perform signing and notarization."
fi fi
@ -59,7 +58,7 @@ fi
if [ "$1" == "notarize" ]; then if [ "$1" == "notarize" ]; then
# user-specific values # 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 # identity as specified in Keychain
@ -75,7 +74,7 @@ if [ "$1" == "notarize" ]; then
ASC_PROVIDER="XXXXXXXXX" ASC_PROVIDER="XXXXXXXXX"
# **************************************************************************************** # ****************************************************************************************
source make-macosx-values.sh source make-macosx-values.local
# release build location # release build location
RELEASE_LOCATION="build/release-darwin-universal2" RELEASE_LOCATION="build/release-darwin-universal2"

2
make-macosx.sh
View file

@ -22,7 +22,7 @@ elif [ "$1" == "arm64" ]; then
BUILDARCH=arm64 BUILDARCH=arm64
else else
echo "Invalid architecture: $1" 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 exit 1
fi fi

1
misc/xcode/xcode-readme.txt
View file

@ -46,6 +46,5 @@ TODO:
NO CARRIER NO CARRIER