From 4c832d573d8265b147dfc9b04a699e0092a27b52 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Wed, 19 Feb 2020 23:17:30 +0100 Subject: [PATCH] Update Ogre SampleBrowser to 1.12.5 --- metadata/org.ogre.browser.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/metadata/org.ogre.browser.yml b/metadata/org.ogre.browser.yml index c16f68f466..e331a6c0a2 100644 --- a/metadata/org.ogre.browser.yml +++ b/metadata/org.ogre.browser.yml @@ -217,11 +217,41 @@ Builds: - gradle -b SampleBrowserNDK/build.gradle assembleRelease ndk: r18b + - versionName: 1.12.5 + versionCode: 14 + commit: v1.12.5 + submodules: true + output: SampleBrowserNDK/app/build/outputs/apk/release/app-release-unsigned.apk + prebuild: sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' + CMake/Templates/AndroidManifest.xml.in + build: + - cmake -DCMAKE_BUILD_TYPE=Release -DOGRE_BUILD_COMPONENT_JAVA=OFF -DANDROID_NATIVE_API_LEVEL=16 + -DANDROID_ABI=arm64-v8a -DCMAKE_TOOLCHAIN_FILE=$$NDK$$/build/cmake/android.toolchain.cmake + . + - cmake --build . -- -j $(nproc) + - gradle -b SampleBrowserNDK/build.gradle assembleRelease + ndk: r18b + + - versionName: 1.12.5 + versionCode: 15 + commit: v1.12.5 + submodules: true + output: SampleBrowserNDK/app/build/outputs/apk/release/app-release-unsigned.apk + prebuild: sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' + CMake/Templates/AndroidManifest.xml.in + build: + - cmake -DCMAKE_BUILD_TYPE=Release -DOGRE_BUILD_COMPONENT_JAVA=OFF -DANDROID_NATIVE_API_LEVEL=16 + -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE=$$NDK$$/build/cmake/android.toolchain.cmake + . + - cmake --build . -- -j $(nproc) + - gradle -b SampleBrowserNDK/build.gradle assembleRelease + ndk: r18b + MaintainerNotes: |- For documentation of cmake options see: http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Options AutoUpdateMode: None UpdateCheckMode: Tags -CurrentVersion: 1.12.4 -CurrentVersionCode: 13 +CurrentVersion: 1.12.5 +CurrentVersionCode: 15