From 2217b93f3065cd31b7e812c5e241d74673fd4090 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 19 Aug 2020 15:47:54 +0200 Subject: [PATCH 1/4] Update android.yml --- .github/workflows/android.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 3b36308d3..dd5f8c2cf 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,9 +32,9 @@ jobs: dir dir prebuilt dir toolchains - dir toolchains/bin dir toolchains/llvm dir sysroot + dir dir # Generating static + shared library for 64bit arquitectures and API version 28 @@ -42,10 +42,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_TOOLCHAIN="C:\Program Files (x86)\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" 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_TOOLCHAIN="C:\Program Files (x86)\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B cd .. + shell: cmd - name: Generate Artifacts run: | From 467ef87a7662398a8f0ba718b11a28fc5950aaa0 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 19 Aug 2020 15:50:32 +0200 Subject: [PATCH 2/4] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index dd5f8c2cf..79c64f1ab 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -42,9 +42,9 @@ jobs: - name: Build Library run: | cd src - make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_TOOLCHAIN="C:\Program Files (x86)\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" + make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_TOOLCHAIN="C:\PROGRA~2\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" make clean - make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_TOOLCHAIN="C:\Program Files (x86)\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B + make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_TOOLCHAIN="C:\PROGRA~2\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B cd .. shell: cmd From 4d627a29ad82a1a6632b798752da04945c5b8c1d Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 19 Aug 2020 15:54:06 +0200 Subject: [PATCH 3/4] Update android.yml --- .github/workflows/android.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 79c64f1ab..589c23762 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -30,11 +30,12 @@ jobs: dir cd ndk-bundle dir - dir prebuilt dir toolchains dir toolchains/llvm - dir sysroot - dir + 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 From 1bea69001c00ad5b57d6dc61a67c5ab7324350a4 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 19 Aug 2020 15:58:52 +0200 Subject: [PATCH 4/4] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 589c23762..b69689370 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -43,9 +43,9 @@ jobs: - name: Build Library run: | cd src - make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=ARM64 ANDROID_TOOLCHAIN="C:\PROGRA~2\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" 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_TOOLCHAIN="C:\PROGRA~2\Android\android-sdk\ndk-bundle\prebuilt\windows-x86_64" 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