shithub: pt2-clone

Download patch

ref: 07160a446c2917eac0c076c9e5117d7fc7975d78
parent: 8f7bb2346388a2014728c8c756c17696640d7d09
author: Olav Sørensen <olav.sorensen@live.no>
date: Wed Jan 13 16:20:35 EST 2021 

New MacOS make-scripts for universal Intel/ARM binary building


--- a/make-macos.sh
+++ b/make-macos.sh
@@ -1,17 +1,80 @@
 #!/bin/bash
 
+# Thanks to odaki on GitHub for this script. I have modified it a bit.
+
 arch=$(arch)
 if [ $arch == "ppc" ]; then
     echo Sorry, PowerPC \(PPC\) is not supported...
-else
-    echo Compiling 64-bit binary, please wait...
-    
-    rm release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone &> /dev/null
-    
-    clang -mmacosx-version-min=10.6 -arch x86_64 -mmmx -mfpmath=sse -msse2 -I/Library/Frameworks/SDL2.framework/Headers -F/Library/Frameworks -g0 -DNDEBUG src/gfx/*.c src/*.c -O3 -lm -Wall -Winit-self -Wextra -Wunused -Wredundant-decls -Wswitch-default -framework SDL2 -framework Cocoa -lm -o release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
-    strip release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
-    install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 release/macos/pt2-clone-macos.app/Contents/MacOS/pt2-clone-macos
-    
-    rm src/gfx/*.o src/*.o &> /dev/null
-    echo Done. The executable can be found in \'release/macos\' if everything went well.
 fi
+
+if [ "$1" = "-v" ]; then
+    VERBOSE=-v
+fi
+
+#
+# Setup variables
+#
+VERSION=v`grep PROG_VER_STR src/pt2_header.h|cut -d'"' -f 2`
+
+RELEASE_MACOS_DIR=release/macos/
+APP_DIR=${RELEASE_MACOS_DIR}pt2-clone-macos.app/
+
+TARGET_X86_64=${APP_DIR}Contents/MacOS/pt2-clone-macos-x86_64
+TARGET_ARM64=${APP_DIR}Contents/MacOS/pt2-clone-macos-arm64
+TARGET_UNIVERSAL=${APP_DIR}Contents/MacOS/pt2-clone-macos
+TARGET_DIR=${APP_DIR}Contents/MacOS/
+
+#
+# Prepare
+#
+if [ ! -d $TARGET_DIR ]; then
+    mkdir -p $TARGET_DIR
+fi
+
+#
+# Compile
+#
+function compile() {
+    rm $1 &> /dev/null
+    clang $VERBOSE $CFLAGS -F /Library/Frameworks -g0 -DNDEBUG src/gfx/*.c src/*.c -Wall -Winit-self -Wextra -Wunused -Wredundant-decls -Wswitch-default  $LDFLAGS -L /Library/Frameworks -framework SDL2 -framework Cocoa -lm -o $1
+    return $?
+}
+
+echo Compiling x86_64 binary, please wait patiently...
+CFLAGS="-target x86_64-apple-macos10.7 -mmacosx-version-min=10.7 -arch x86_64 -mmmx -mfpmath=sse -msse2 -O3"
+LDFLAGS=
+export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+compile $TARGET_X86_64
+if [ $? -ne 0 ]; then
+    echo failed
+    exit 1
+fi
+
+echo Compiling arm64 binary, please wait patiently...
+CFLAGS="-target arm64-apple-macos11 -mmacosx-version-min=11.0 -arch arm64 -march=armv8.3-a+sha3 -O3"
+LDFLAGS=
+export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+compile $TARGET_ARM64
+if [ $? -ne 0 ]; then
+    echo failed
+    exit 1
+fi
+
+#
+# Merge binaries
+#
+# Reference: Building a Universal macOS Binary
+#   https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary
+echo Building universal binary...
+rm $TARGET_UNIVERAL &> /dev/null
+lipo -create -output $TARGET_UNIVERSAL $TARGET_X86_64 $TARGET_ARM64
+rm $TARGET_X86_64
+rm $TARGET_ARM64
+strip $TARGET_UNIVERSAL
+install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 $TARGET_UNIVERSAL
+echo Done. The executable can be found in \'${RELEASE_MACOS_DIR}\' if everything went well.
+
+#
+# Cleanup
+#
+rm src/gfx/*.o src/*.o &> /dev/null
--- a/pt_pal_editor/make-macos.sh
+++ b/pt_pal_editor/make-macos.sh
@@ -1,16 +1,78 @@
 #!/bin/bash
 
+# Thanks to odaki on GitHub for this script. I have modified it a bit.
+
 arch=$(arch)
 if [ $arch == "ppc" ]; then
     echo Sorry, PowerPC \(PPC\) is not supported...
-else
-    echo Compiling 64-bit binary, please wait...
-    
-    rm release/macos/pt_pal_editor-macos.app/Contents/MacOS/pt_pal_editor-macos &> /dev/null
-    
-    clang -mmacosx-version-min=10.6 -arch x86_64 -mmmx -mfpmath=sse -msse2 -I/Library/Frameworks/SDL2.framework/Headers -F/Library/Frameworks src/tinyfiledialogs/*.c src/gfx/*.c src/*.c -O3 -framework SDL2 -framework Cocoa -o release/macos/pt_pal_editor-macos.app/Contents/MacOS/pt_pal_editor-macos
-    install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 release/macos/pt_pal_editor-macos.app/Contents/MacOS/pt_pal_editor-macos
-    
-    rm src/tinyfiledialogs/*.o src/gfx/*.o src/*.o &> /dev/null
-    echo Done. The executable can be found in \'release/macos\' if everything went well.
 fi
+
+if [ "$1" = "-v" ]; then
+    VERBOSE=-v
+fi
+
+#
+# Setup variables
+#
+RELEASE_MACOS_DIR=release/macos/
+APP_DIR=${RELEASE_MACOS_DIR}pt_pal_editor-macos.app/
+
+TARGET_X86_64=${APP_DIR}Contents/MacOS/pt_pal_editor-macos-x86_64
+TARGET_ARM64=${APP_DIR}Contents/MacOS/pt_pal_editor-macos-arm64
+TARGET_UNIVERSAL=${APP_DIR}Contents/MacOS/pt_pal_editor-macos
+TARGET_DIR=${APP_DIR}Contents/MacOS/
+
+#
+# Prepare
+#
+if [ ! -d $TARGET_DIR ]; then
+    mkdir -p $TARGET_DIR
+fi
+
+#
+# Compile
+#
+function compile() {
+    rm $1 &> /dev/null
+    clang $VERBOSE $CFLAGS -F /Library/Frameworks -g0 -DNDEBUG src/tinyfiledialogs/*.c src/gfx/*.c src/*.c $LDFLAGS -L /Library/Frameworks -framework SDL2 -framework Cocoa -o $1
+    return $?
+}
+
+echo Compiling x86_64 binary...
+CFLAGS="-target x86_64-apple-macos10.7 -mmacosx-version-min=10.7 -arch x86_64 -mmmx -mfpmath=sse -msse2 -O3"
+LDFLAGS=
+export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+compile $TARGET_X86_64
+if [ $? -ne 0 ]; then
+    echo failed
+    exit 1
+fi
+
+echo Compiling arm64 binary...
+CFLAGS="-target arm64-apple-macos11 -mmacosx-version-min=11.0 -arch arm64 -march=armv8.3-a+sha3 -O3"
+LDFLAGS=
+export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+compile $TARGET_ARM64
+if [ $? -ne 0 ]; then
+    echo failed
+    exit 1
+fi
+
+#
+# Merge binaries
+#
+# Reference: Building a Universal macOS Binary
+#   https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary
+echo Building universal binary...
+rm $TARGET_UNIVERAL &> /dev/null
+lipo -create -output $TARGET_UNIVERSAL $TARGET_X86_64 $TARGET_ARM64
+rm $TARGET_X86_64
+rm $TARGET_ARM64
+strip $TARGET_UNIVERSAL
+install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 $TARGET_UNIVERSAL
+echo Done. The executable can be found in \'${RELEASE_MACOS_DIR}\' if everything went well.
+
+#
+# Cleanup
+#
+rm src/gfx/*.o src/*.o &> /dev/null