diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 34ecf249..cdfaabb7 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -257,13 +257,9 @@ build_libretro_leiradel_makefile() { cd $SUBDIR OLDJ=$JOBS - if [ "${NAME}" = "mame078" ]; then - JOBS=1 - fi - if [ -z "${NOCLEAN}" ]; then echo "cleaning up..." - echo "cleanup command: ${MAKE}.${ARGS} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean" + echo "cleanup command: ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} ${ARGS} clean" ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} clean if [ $? -eq 0 ]; then echo BUILDBOT JOB: $jobid $1 cleanup success! @@ -273,7 +269,7 @@ build_libretro_leiradel_makefile() { fi echo "compiling..." - echo "build command: ${MAKE}.${ARGS} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" + echo "build command: ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS}" ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} &> /tmp/buildbot.log if [ $? -eq 0 ]; then diff --git a/recipes/win_x64/gw-mingw-w64-seh b/recipes/win_x64/gw-mingw-w64-seh index 7945ad3c..d4826694 100644 --- a/recipes/win_x64/gw-mingw-w64-seh +++ b/recipes/win_x64/gw-mingw-w64-seh @@ -1,2 +1 @@ -gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES GENERIC Makefile.mingw32 build - +gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build mingw64 diff --git a/recipes/win_x64/gw-mingw-w64-seh.conf b/recipes/win_x64/gw-mingw-w64-seh.conf index 2dea9de0..132e10fb 100644 --- a/recipes/win_x64/gw-mingw-w64-seh.conf +++ b/recipes/win_x64/gw-mingw-w64-seh.conf @@ -1,8 +1,7 @@ PATH /mingw64/bin platform MINGW64 ARCH x86_64 -MAKE mingw32-make.exe +MAKE make.exe CC gcc CXX g++ CXX11 g++ -SUFFIX .mingw32