Explorar o código

Merge branch 'master' of https://github.com/raysan5/raylib

raysan5 %!s(int64=5) %!d(string=hai) anos
pai
achega
687187b5cf
Modificáronse 1 ficheiros con 7 adicións e 5 borrados
  1. 7 5
      .github/workflows/android.yml

+ 7 - 5
.github/workflows/android.yml

@@ -30,11 +30,12 @@ jobs:
         dir
         cd ndk-bundle
         dir
-        dir prebuilt
         dir toolchains
-        dir toolchains/bin
         dir toolchains/llvm
-        dir sysroot
+        dir toolchains/llvm/prebuilt
+        dir toolchains/llvm/prebuilt/windows-x86_64
+        dir toolchains/llvm/prebuilt/windows-x86_64/bin
+        dir sources/android/native_app_glue
         dir 
    
     # Generating static + shared library for 64bit arquitectures and API version 28
@@ -42,10 +43,11 @@ jobs:
     - name: Build Library
       run: |
         cd src
-        make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_COMPILER_PATH= RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_NDK="C:\PROGRA~2\Android\android-sdk\ndk-bundle" RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
         make clean
-        make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_COMPILER_PATH= RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_NDK="C:\PROGRA~2\Android\android-sdk\ndk-bundle" RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
+      shell: cmd
   
     - name: Generate Artifacts
       run: |