forked from wheremyfoodat/Panda3DS
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e18e024
commit 172159e
Showing
1 changed file
with
6 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,7 @@ jobs: | |
| ${{ runner.os }}-pandroid-x86_64- | ||
| - name: Setup Vulkan SDK | ||
| if: ${{ env.CODE_CHANGED == 'true' }} | ||
| uses: humbletim/[email protected] | ||
| with: | ||
| vulkan-query-version: latest | ||
|
|
@@ -55,7 +56,7 @@ jobs: | |
|
|
||
| - name: Configure CMake | ||
| run: | | ||
| if [[ "${{ env.CODE_CHANGED }}" != "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/x86_64/libAlber.so" ]; then | ||
| if [[ "${{ env.CODE_CHANGED }}" == "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/x86_64/libAlber.so" ]; then | ||
| echo "Code changed, rebuilding from scratch..." | ||
| cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DENABLE_VULKAN=0 -DENABLE_USER_BUILD=ON | ||
| fi | ||
|
|
@@ -67,7 +68,7 @@ jobs: | |
| rm -f ./src/pandroid/app/src/main/jniLibs/x86_64/libAlber.so | ||
| fi | ||
| if [[ "${{ env.CODE_CHANGED }}" != "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/x86_64/libAlber.so" ]; then | ||
| if [[ "${{ env.CODE_CHANGED }}" == "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/x86_64/libAlber.so" ]; then | ||
| # Apply patch for GLES compatibility | ||
| git apply ./.github/gles.patch | ||
| # Build the project with CMake | ||
|
|
@@ -124,6 +125,7 @@ jobs: | |
| ${{ runner.os }}-pandroid-arm64- | ||
| - name: Setup Vulkan SDK | ||
| if: ${{ env.CODE_CHANGED == 'true' }} | ||
| uses: humbletim/[email protected] | ||
| with: | ||
| vulkan-query-version: latest | ||
|
|
@@ -138,7 +140,7 @@ jobs: | |
|
|
||
| - name: Configure CMake | ||
| run: | | ||
| if [[ "${{ env.CODE_CHANGED }}" != "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/arm64-v8a/libAlber.so" ]; then | ||
| if [[ "${{ env.CODE_CHANGED }}" == "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/arm64-v8a/libAlber.so" ]; then | ||
| echo "Code changed, rebuilding from scratch..." | ||
| cmake -B ${{github.workspace}}/build -DBUILD_HYDRA_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DENABLE_USER_BUILD=ON -DCMAKE_CXX_FLAGS="-march=armv8-a+crypto" | ||
| fi | ||
|
|
@@ -150,7 +152,7 @@ jobs: | |
| rm -f ./src/pandroid/app/src/main/jniLibs/arm64-v8a/libAlber.so | ||
| fi | ||
| if [[ "${{ env.CODE_CHANGED }}" != "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/arm64-v8a/libAlber.so" ]; then | ||
| if [[ "${{ env.CODE_CHANGED }}" == "true" ]] || [ ! -f "./src/pandroid/app/src/main/jniLibs/arm64-v8a/libAlber.so" ]; then | ||
| # Apply patch for GLES compatibility | ||
| git apply ./.github/gles.patch | ||
|
|
||