fix android build

solarenterprises · Mar 20, 2024 · fd579d6 · fd579d6
1 parent 1b39fa2
commit fd579d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -181,7 +181,7 @@ jobs:
 
       - name: Install deps
         run: |
-          sudo rm /var/lib/man-db/auto-update
+          sudo rm /var/lib/man-db/auto-update || true
           sudo apt-get update
           sudo apt-get install -qyy wget unzip zip gcc-multilib make cmake
 
@@ -201,10 +201,12 @@ jobs:
         if: ${{ steps.cache-ndk.outputs.cache-hit != 'true' }}
 
       - name: Build
-        run: ./scripts/ci-build-android.sh ${{ matrix.arch }}
+        run: |
+            chmod +x ./scripts/ci-build-android.sh
+            ./scripts/ci-build-android.sh ${{ matrix.arch }}
 
-      #- name: Upload Artifact
-      #  uses: actions/upload-artifact@v4
-      #  with:
-      #    name: irrlicht-android-${{ matrix.arch }}
-      #    path: ${{ runner.temp }}/pkg/${{ matrix.arch }}
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+         name: irrlicht-android-${{ matrix.arch }}
+         path: ${{ runner.temp }}/pkg/${{ matrix.arch }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,7 @@ export(EXPORT IrrlichtMt-export
 # Installation of headers.
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
 	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/irrlichtmt"
+	FILES_MATCHING PATTERN "*.h"
 )
 
 # Installation of CMake target and configuration files.

diff --git a/include/CNullDriver.h → source/Irrlicht/CNullDriver.h b/include/CNullDriver.h → source/Irrlicht/CNullDriver.h