update sdl3 action

madwind · Jan 26, 2025 · 42e1f1d · 42e1f1d
1 parent 8880664
commit 42e1f1d
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/build_sdl3_pr.yml b/.github/workflows/build_sdl3_pr.yml
@@ -43,7 +43,7 @@ jobs:
             -e BUILD_TYPE=${{ env.BUILD_TYPE }}
           run: |
             cd /workspace
-            ./src/Ryujinx.SDL3-CS/External/build.sh
+            ./src/Ryujinx.SDL3-CS/external/build.sh
 
       - name: Build
         if: ${{ !contains(matrix.platform.container, 'arm') }}
@@ -53,7 +53,7 @@ jobs:
           TARGET_APT_ARCH: ${{ matrix.platform.target_apt_arch }}
           RUNNER_OS: ${{ runner.os }}
           FLAGS: ${{ matrix.platform.flags }}
-        run: ./src/Ryujinx.SDL3-CS/External/build.sh
+        run: ./src/Ryujinx.SDL3-CS/external/build.sh
 
       - name: Get Actions user id
         if: runner.os == 'Linux'
@@ -85,7 +85,7 @@ jobs:
           submodules: true
 
       - name: Build (iOS)
-        run: xcodebuild -project External/SDL/Xcode/SDL/SDL.xcodeproj -target SDL3.xcframework -configuration Release
+        run: xcodebuild -project src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/SDL.xcodeproj -target SDL3.xcframework -configuration Release
 
       - name: Prepare release directory (iOS)
         run: mkdir -p native/ios
@@ -94,11 +94,11 @@ jobs:
         run: |
           mkdir -p native/ios/SDL3.xcframework/ios-arm64/SDL3.framework;
           mkdir -p native/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework;
-          cp External/SDL/Xcode/SDL/build/SDL3.xcframework/Info.plist                                           native/ios/SDL3.xcframework/Info.plist;
-          cp External/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64/SDL3.framework/SDL3                        native/ios/SDL3.xcframework/ios-arm64/SDL3.framework/SDL3;
-          cp External/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist                  native/ios/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist;
-          cp External/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3       native/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3;
-          cp External/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist native/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist;
+          cp src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/build/SDL3.xcframework/Info.plist                                           src/Ryujinx.SDL3-CS/runtimes/ios/SDL3.xcframework/Info.plist;
+          cp src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64/SDL3.framework/SDL3                        src/Ryujinx.SDL3-CS/runtimes/ios/SDL3.xcframework/ios-arm64/SDL3.framework/SDL3;
+          cp src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist                  src/Ryujinx.SDL3-CS/runtimes/ios/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist;
+          cp src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3       src/Ryujinx.SDL3-CS/runtimes/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3;
+          cp src/Ryujinx.SDL3-CS/external/SDL/Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist src/Ryujinx.SDL3-CS/runtimes/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist;
 
       - name: Compress native directory
         run: tar -cf native-ios.tar native/ios
@@ -146,7 +146,7 @@ jobs:
           rm -rf $OUTPUT && mkdir -p $OUTPUT
 
           # Build SDL3
-          ./src/Ryujinx.SDL3-CS/External/SDL/build-scripts/androidbuildlibs.sh APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" NDK_LIBS_OUT="$OUTPUT"
+          ./src/Ryujinx.SDL3-CS/external/SDL/build-scripts/androidbuildlibs.sh APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" NDK_LIBS_OUT="$OUTPUT"
 
       - name: Build SDL3 Android Java
         run: |
@@ -156,7 +156,7 @@ jobs:
           rm -rf $OUTPUT && mkdir -p $OUTPUT
 
           # Build SDL3 Android Java part
-          cd ./src/Ryujinx.SDL3-CS/External/SDL/android-project/app/src/main/java
+          cd ./src/Ryujinx.SDL3-CS/external/SDL/android-project/app/src/main/java
           javac -cp $ANDROID_HOME/platforms/$PLATFORM_VER/android.jar -encoding utf8 org/libsdl/app/*.java
           jar cvf $OUTPUT/SDL3AndroidBridge.jar org/libsdl/app/*.class