From bd19d17932a6edb8b58e2bc9b028e304a5febab5 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sat, 2 Dec 2017 00:05:16 +0100 Subject: [PATCH] Update Ogre SampleBrowser to 1.10.10 --- metadata/org.ogre.browser.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/metadata/org.ogre.browser.txt b/metadata/org.ogre.browser.txt index 82621845f6..38b72c719f 100644 --- a/metadata/org.ogre.browser.txt +++ b/metadata/org.ogre.browser.txt @@ -58,6 +58,26 @@ Build:1.10.9,5 ant -f SampleBrowserNDK/build.xml release ndk=r15c +Build:1.10.10,6 + commit=v1.10.10 + output=SampleBrowserNDK/bin/NativeActivity-release-unsigned.apk + prebuild=sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' CMake/Templates/AndroidManifest.xml.in + build=export ANDROID_SDK=$$SDK$$ && \ + cmake -DCMAKE_BUILD_TYPE=Release -DOGRE_BUILD_COMPONENT_JAVA=OFF -DOGRE_USE_STD11=ON -DOGRE_NODE_STORAGE_LEGACY=OFF -DOGRE_RESOURCEMANAGER_STRICT=ON -DANDROID_NATIVE_API_LEVEL=16 -DANDROID_ABI="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=CMake/toolchain/android.toolchain.cmake . && \ + cmake --build . -- -j $(nproc) && \ + ant -f SampleBrowserNDK/build.xml release + ndk=r15c + +Build:1.10.10,7 + commit=v1.10.10 + output=SampleBrowserNDK/bin/NativeActivity-release-unsigned.apk + prebuild=sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' CMake/Templates/AndroidManifest.xml.in + build=export ANDROID_SDK=$$SDK$$ && \ + cmake -DCMAKE_BUILD_TYPE=Release -DOGRE_BUILD_COMPONENT_JAVA=OFF -DOGRE_USE_STD11=ON -DOGRE_NODE_STORAGE_LEGACY=OFF -DOGRE_RESOURCEMANAGER_STRICT=ON -DANDROID_NATIVE_API_LEVEL=16 -DANDROID_ABI="x86" -DCMAKE_TOOLCHAIN_FILE=CMake/toolchain/android.toolchain.cmake . && \ + cmake --build . -- -j $(nproc) && \ + ant -f SampleBrowserNDK/build.xml release + ndk=r15c + Maintainer Notes: For documentation of cmake options see: http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Options