Merge branch 'master' into 'master'
Update Ogre SampleBrowser to 1.12.4 See merge request fdroid/fdroiddata!5621
This commit is contained in:
commit
50c5b2ffa9
|
@ -187,11 +187,39 @@ Builds:
|
|||
- ant -f SampleBrowserNDK/build.xml release
|
||||
ndk: r15c
|
||||
|
||||
- versionName: 1.12.4
|
||||
versionCode: 12
|
||||
commit: v1.12.4
|
||||
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: r17
|
||||
|
||||
- versionName: 1.12.4
|
||||
versionCode: 13
|
||||
commit: v1.12.4
|
||||
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: r17
|
||||
|
||||
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.11.1
|
||||
CurrentVersionCode: 11
|
||||
CurrentVersion: 1.12.4
|
||||
CurrentVersionCode: 13
|
||||
|
|
Loading…
Reference in a new issue