diff --git a/package/ci/jenkins-emscripten.xml b/package/ci/jenkins-emscripten.xml index 2252c3a27..916941224 100644 --- a/package/ci/jenkins-emscripten.xml +++ b/package/ci/jenkins-emscripten.xml @@ -39,6 +39,13 @@ false Magnum + + gl + + webgl1 + webgl2 + + compatibility @@ -60,17 +67,25 @@ else deprecated_build_flag=OFF fi -mkdir -p build-emscripten-${compatibility} -cd build-emscripten-${compatibility} +if [ "${gl}" = "webgl1" ] ; then + target_gles2_flag=ON +else + target_gles2_flag=OFF +fi + +mkdir -p build-emscripten-${compatibility}-${gl} +cd build-emscripten-${compatibility}-${gl} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ - -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ + -DCMAKE_PREFIX_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ + -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/emscripten-${compatibility}-${gl} \ -DBUILD_DEPRECATED=${deprecated_build_flag} \ `#-DWITH_AUDIO=ON` \ + -DTARGET_GLES2=${target_gles2_flag} \ -DWITH_SDL2APPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_OBJIMPORTER=ON \ @@ -98,7 +113,7 @@ make -j install true