Skip to content

Commit ed425a0

Browse files
sapphire support (#8)
Signed-off-by: rooot <hey@rooot.gay> Co-authored-by: Jasmine <52604018+hiimjasmine00@users.noreply.github.com>
1 parent 953fbc1 commit ed425a0

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
os: windows-latest
1717
- name: macOS
1818
os: macos-latest
19+
- name: iOS
20+
os: macos-latest
21+
target: iOS
1922
- name: Android32
2023
os: ubuntu-latest
2124
target: Android32
@@ -37,7 +40,8 @@ jobs:
3740
- name: Build the mod
3841
uses: ./
3942
with:
40-
# sdk: nightly
43+
cli: nightly
44+
sdk: nightly
4145
build-config: RelWithDebInfo
4246
path: textureldr
4347
combine: true

action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ inputs:
3131
required: false
3232
default: false
3333
target:
34-
description: Geode target to build for. Can be either "Win64", "MacOS", "Android32" or "Android64".
34+
description: Geode target to build for. Can be either "Win64", "MacOS", "iOS", "Android32" or "Android64".
3535
required: false
3636
default: ""
3737
bindings:
@@ -100,6 +100,8 @@ runs:
100100
OUTPUT_ID=win
101101
elif [ "$TARGET" = "MacOS" ]; then
102102
OUTPUT_ID=mac
103+
elif [ "$TARGET" = "iOS" ]; then
104+
OUTPUT_ID=ios
103105
fi
104106
105107
echo "id=$ID" >> $GITHUB_OUTPUT
@@ -243,6 +245,8 @@ runs:
243245
CMAKE_EXTRA_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-${{ inputs.android-min-sdk }}"
244246
elif [ ${{ steps.platform.outputs.target_id }} = "android64" ]; then
245247
CMAKE_EXTRA_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-${{ inputs.android-min-sdk }}"
248+
elif [ ${{ steps.platform.outputs.target_id }} = "ios" ]; then
249+
CMAKE_EXTRA_ARGS="-DCMAKE_SYSTEM_NAME=iOS -DGEODE_TARGET_PLATFORM=iOS -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF"
246250
fi
247251
if [ "${{ inputs.use-lto }}" = "true" ]; then
248252
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"

combine/action.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ runs:
6161
if [ -f "./artifacts/geode-build-android64/$mod" ]; then
6262
PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-android64/$mod"
6363
fi
64+
if [ -f "./artifacts/geode-build-ios/$mod" ]; then
65+
PACKAGE_ARGS="$PACKAGE_ARGS ./artifacts/geode-build-ios/$mod"
66+
fi
6467
ARG_LIST=($PACKAGE_ARGS)
6568
# why does it merge into the first one instead of just an output..
6669
FIRST="${ARG_LIST[0]}"
@@ -87,6 +90,12 @@ runs:
8790
name: geode-build-mac
8891
failOnError: false
8992

93+
- uses: geekyeggo/delete-artifact@v5
94+
if: ${{ inputs.delete-artifacts }}
95+
with:
96+
name: geode-build-ios
97+
failOnError: false
98+
9099
- uses: geekyeggo/delete-artifact@v5
91100
if: ${{ inputs.delete-artifacts }}
92101
with:

0 commit comments

Comments
 (0)