diff --git a/package/ci/jenkins-android.xml b/package/ci/jenkins-android.xml index d215debc0..1194044d1 100644 --- a/package/ci/jenkins-android.xml +++ b/package/ci/jenkins-android.xml @@ -39,6 +39,13 @@ false Magnum + + gl + + es2 + es3 + + toolchain @@ -61,22 +68,30 @@ git submodule init git submodule update +if [ ${gl} = "es2" ] ; then + gl_flags="-DTARGET_GLES=ON -DTARGET_GLES2=ON" +elif [ ${gl} = "es3" ] ; then + gl_flags="-DTARGET_GLES=ON -DTARGET_GLES2=OFF" +fi + if [ "${compatibility}" = "deprecated" ] ; then deprecated_build_flag=ON else deprecated_build_flag=OFF fi -mkdir -p build-android-${toolchain}-${compatibility} -cd build-android-${toolchain}-${compatibility} +mkdir -p build-android-${gl}-${toolchain}-${compatibility} +cd build-android-${gl}-${toolchain}-${compatibility} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/Android-${toolchain}.cmake \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \ - -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \ + -DCMAKE_PREFIX_PATH=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \ + -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/android-${gl}-${toolchain}-${compatibility} \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ + ${gl_flags} \ `#-DWITH_AUDIO=ON` \ -DWITH_ANDROIDAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ @@ -108,7 +123,7 @@ ninja install/strip true