Merge branch 'master' into 'master'
Update Ogre SampleBrowser to 1.10.9 See merge request fdroid/fdroiddata!2619
This commit is contained in:
commit
647feb6958
|
@ -38,6 +38,26 @@ Build:1.10.8,3
|
||||||
ant -f SampleBrowserNDK/build.xml release
|
ant -f SampleBrowserNDK/build.xml release
|
||||||
ndk=r15c
|
ndk=r15c
|
||||||
|
|
||||||
|
Build:1.10.9,4
|
||||||
|
commit=v1.10.9
|
||||||
|
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.9,5
|
||||||
|
commit=v1.10.9
|
||||||
|
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:
|
Maintainer Notes:
|
||||||
For documentation of cmake options see:
|
For documentation of cmake options see:
|
||||||
http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Options
|
http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Options
|
||||||
|
@ -45,5 +65,5 @@ http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Option
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
Update Check Mode:Tags
|
Update Check Mode:Tags
|
||||||
Current Version:1.10.8
|
Current Version:1.10.9
|
||||||
Current Version Code:3
|
Current Version Code:5
|
||||||
|
|
Loading…
Reference in a new issue