Merge branch 'master' into 'master'
Update Ogre SampleBrowser to 1.11.1 See merge request fdroid/fdroiddata!3301
This commit is contained in:
commit
e1fbb9d04c
|
@ -103,6 +103,26 @@ Build:1.10.11,9
|
|||
ant -f SampleBrowserNDK/build.xml release
|
||||
ndk=r15c
|
||||
|
||||
Build:1.11.1,10
|
||||
commit=v1.11.1
|
||||
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 -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.11.1,11
|
||||
commit=v1.11.1
|
||||
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 -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
|
||||
|
@ -110,5 +130,5 @@ http://www.ogre3d.org/2017/09/02/ogre-1-10-mid-term-report > Compile Time Option
|
|||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:1.10.11
|
||||
Current Version Code:9
|
||||
Current Version:1.11.1
|
||||
Current Version Code:11
|
||||
|
|
Loading…
Reference in a new issue