From ae8ae05e981b9356dd2f5962aa24f07716383a87 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 26 Mar 2020 21:17:30 +0100 Subject: [PATCH] Fix cmake for emscripten Add missing newline and run cmake under emmake --- libretro-buildbot-recipe.sh | 6 +++--- recipes/emscripten/emscripten.conf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index e14a36e3..5f0b17f9 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -398,10 +398,10 @@ build_libretro_generic_makefile() { fi eval "set -- ${EXTRAARGS} \${CORE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" - echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE" + echo "BUILD CMD: ${HELPER} ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE" echo "$@" .. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE" - echo "BUILD CMD: ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE" - ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE" + echo "BUILD CMD: ${HELPER} ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE" + ${HELPER} ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE" find . -mindepth 2 -name "${CORENAM}" -exec cp -f "{}" . \; elif [ "${COMMAND}" = "LEIRADEL" ]; then diff --git a/recipes/emscripten/emscripten.conf b/recipes/emscripten/emscripten.conf index 87447350..5bf1add4 100644 --- a/recipes/emscripten/emscripten.conf +++ b/recipes/emscripten/emscripten.conf @@ -5,4 +5,4 @@ HELPER emmake MAKE make RA YES CORE_JOB YES -CMAKE cmake \ No newline at end of file +CMAKE cmake