Add UEFI target

.github/workflows/build.yml

@@ -144,7 +144,7 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 21
-          sudo apt-get install libc++-21* libc++abi*21* -y --no-install-recommends
+          sudo apt-get install libc++-21* libc++abi-*21* -y --no-install-recommends
           echo "CC=clang-21" >> "$GITHUB_ENV"
           echo "CXX=clang++-21" >> "$GITHUB_ENV"
           echo "OBJC=clang-21" >> "$GITHUB_ENV"
@@ -166,16 +166,6 @@ jobs:
           version: 15
           platform: x64
 
-      - name: Unbreak Python in GHA (MacOS 13 image)
-        if: matrix.config.os == 'macos' && matrix.config.os-version == 13
-        run: |
-          # TODO: remove this, after it works again
-          # A workaround for "The `brew link` step did not complete successfully" error.
-          # See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
-          find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
-          sudo rm -rf /Library/Frameworks/Python.framework/
-          brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
-
       - name: Setup Clang (MacOS)
         if: matrix.config.os == 'macos'
         run: |

io.github.openbrickprotocolfoundation.oopetris.yml

@@ -12,7 +12,6 @@ modules:
       - -Dbuild_installer=true
       - --libdir=lib
       - -Dtests=true
-      - -Dsdl2_image:test=false
       - --fatal-meson-warnings
       - -Drun_in_ci=true # note we always want the CI checks in the case we built the flatpak
       - --force-fallback-for=fmt # note, the freedesktop sdk has this installed, but it is not copiable into the runtime, so we need to build it ourself, to be able to install it correctly

platforms/.gitignore

@@ -1,5 +1,6 @@
 crossbuild.ini
 crossbuild/*.ini
+crossbuild/uefi*.json
 
 *.elf
 *.nacp

platforms/android/app/build.gradle

@@ -130,7 +130,7 @@ List getAndroidABIs() {
 /**
  * Determine the version
  * if you specify it explicitly, that will be used, otherwise meson introspect will be called
- * @return String
+ * @returns String
  */
 String getVersion() {
     String property = project.findProperty('VERSION')
@@ -320,7 +320,7 @@ android {
     }
 
     compileSdkVersion 35
-    ndkVersion = "29.0.14206865"
+    ndkVersion = "29.0.14033849"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"

platforms/build-3ds.sh

@@ -32,7 +32,7 @@ elif [ "$#" -eq 3 ]; then
         RUN_IN_CI="true"
     fi
 else
-    echo "Too many arguments given, expected 1, 2 or 3"
+    echo "Too many arguments given, expected 1, 2 or 3" >&2
     exit 1
 fi
 
@@ -41,7 +41,7 @@ if [ "$COMPILE_TYPE" == "smart" ]; then
 elif [ "$COMPILE_TYPE" == "complete_rebuild" ]; then
     : # noop
 else
-    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'"
+    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'" >&2
     exit 1
 fi
 
@@ -67,7 +67,6 @@ export BUILD_DIR="build/3ds"
 
 export TOOL_PREFIX="arm-none-eabi"
 
-
 export BIN_DIR="$PORTLIBS_PATH_3DS/bin"
 export PKG_CONFIG_EXEC="$BIN_DIR/$TOOL_PREFIX-pkg-config"
 export CMAKE="$BIN_DIR/$TOOL_PREFIX-cmake"

platforms/build-android.sh

@@ -41,22 +41,22 @@ fi
 
 if [ ! -e "$BASE_PATH/meta/abis.json" ]; then
 
-    echo "no abis.json file found, to determine supported abis"
+    echo "no abis.json file found, to determine supported abis" >&2
     exit 2
 
 fi
 
 if [ ! -e "$BASE_PATH/meta/platforms.json" ]; then
 
-    echo "no platforms.json file found, to determine supported platforms and SDKs"
+    echo "no platforms.json file found, to determine supported platforms and SDKs" >&2
     exit 2
 
 fi
 
 SDK_VERSION=$(jq '.max' -M -r -c "$BASE_PATH/meta/platforms.json")
 export SDK_VERSION
 
-mapfile -t ARCH_KEYS < <(jq 'keys' -M -r -c "$BASE_PATH/meta/abis.json" | tr -d '[]"' | sed 's/,/\n/g')
+mapfile -t ARCH_KEYS < <(jq 'keys[]' -M -r -c "$BASE_PATH/meta/abis.json")
 
 export ARCH_KEYS_INDEX=("${!ARCH_KEYS[@]}")
 
@@ -82,7 +82,7 @@ elif [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || [ "$#" -eq 3 ] || [ "$#" -eq 4 ]; then
     done
 
     if [ -z "$FOUND" ]; then
-        echo "Invalid arch: '${ARCH}', supported archs are:" "${ARCH_KEYS[@]}"
+        echo "Invalid arch: '${ARCH}', supported archs are:" "${ARCH_KEYS[@]}" >&2
         exit 2
     fi
 
@@ -106,7 +106,7 @@ elif [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || [ "$#" -eq 3 ] || [ "$#" -eq 4 ]; then
     fi
 
 else
-    echo "Too many arguments given, expected 1, 2, 3 or 4"
+    echo "Too many arguments given, expected 1, 2, 3 or 4" >&2
     exit 1
 fi
 
@@ -115,11 +115,10 @@ if [ "$COMPILE_TYPE" == "smart" ]; then
 elif [ "$COMPILE_TYPE" == "complete_rebuild" ]; then
     : # noop
 else
-    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'"
+    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'" >&2
     exit 1
 fi
 
-
 for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
     export KEY=${ARCH_KEYS[$INDEX]}
 
@@ -148,7 +147,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
 
     if [ "$COMPILE_TYPE" == "complete_rebuild" ] || ! [ -e "$SYS_ROOT" ]; then
 
-
         if [ -d "${SYS_ROOT:?}/" ]; then
 
             rm -rf "${SYS_ROOT:?}/"
@@ -249,7 +247,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
 
     ## build flac with cmake (meson port doesn't work for 32 bits machines atm) (we need to check for fseeko and ftello correctly in there)
 
-
     pushd "$SYS_ROOT"
 
     BUILD_DIR_FLAC="build-flac"
@@ -377,7 +374,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
 
     validate_parent_dir "$CROSS_FILE"
 
-
     cat <<EOF >"$CROSS_FILE"
 [host_machine]
 system = 'android'
@@ -477,7 +473,7 @@ EOF
 
 done
 
-# TODO only copy the supported music ones (atm we need both for i686 flac is needed!)
+# TODO only copy the supported music ones (atm we need both, for i686 flac is needed!)
 
 cp -r ./assets/ platforms/android/app/src/main
 

platforms/build-switch.sh

@@ -32,7 +32,7 @@ elif [ "$#" -eq 3 ]; then
         RUN_IN_CI="true"
     fi
 else
-    echo "Too many arguments given, expected 1, 2 or 3"
+    echo "Too many arguments given, expected 1, 2 or 3" >&2
     exit 1
 fi
 
@@ -41,7 +41,7 @@ if [ "$COMPILE_TYPE" == "smart" ]; then
 elif [ "$COMPILE_TYPE" == "complete_rebuild" ]; then
     : # noop
 else
-    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'"
+    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'" >&2
     exit 1
 fi
 
@@ -55,7 +55,6 @@ source "$SCRIPT_DIR/versions.sh"
 # shellcheck source=./platforms/helper.sh
 source "$SCRIPT_DIR/helper.sh"
 
-
 export DEVKITPRO="/opt/devkitpro"
 export ARCH_DEVKIT_FOLDER="$DEVKITPRO/devkitA64"
 export COMPILER_BIN="$ARCH_DEVKIT_FOLDER/bin"