From 785017fa3740fd8ce779c49a5ef75281f9b3649a Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Mon, 2 Mar 2020 20:32:20 +0100 Subject: [PATCH] Fix Ogre SampleBrowser build workaround the old cmake on the buildserver --- metadata/org.ogre.browser.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/metadata/org.ogre.browser.yml b/metadata/org.ogre.browser.yml index e331a6c0a2..25cae3e91e 100644 --- a/metadata/org.ogre.browser.yml +++ b/metadata/org.ogre.browser.yml @@ -222,8 +222,9 @@ Builds: 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 + prebuild: + - sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' CMake/Templates/AndroidManifest.xml.in + - sed -i -e 's|GREATER_EQUAL|EQUAL|g' CMake/Utils/PrecompiledHeader.cmake 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 @@ -237,8 +238,9 @@ Builds: 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 + prebuild: + - sed -i 's/android:versionCode="1"/android:versionCode="$$VERCODE$$"/' CMake/Templates/AndroidManifest.xml.in + - sed -i -e 's|GREATER_EQUAL|EQUAL|g' CMake/Utils/PrecompiledHeader.cmake 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