From a9058d9a96ca7724fb6121ab937c5356b836051a Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 9 Nov 2014 08:03:16 -0800 Subject: [PATCH 1/3] add win32 recipes --- libretro-buildbot-recipe.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 756c02d9..54635d6d 100644 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -409,8 +409,6 @@ while read line; do if [ "${PREVCORE}" == "BSNES" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then FORCE="YES" BUILD="YES" - else - FORCE="NO" fi From 62b8a3e756f476f9d682302df29beb8314850b58 Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 9 Nov 2014 09:05:45 -0800 Subject: [PATCH 2/3] move problematic cores to build with sjlj --- libretro-buildbot-recipe.sh | 19 +++++++++++++++---- recipes/recipes.win-mingw64-seh | 2 -- recipes/recipes.win-mingw64-sjlj | 4 +++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 54635d6d..5a26b446 100644 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -191,7 +191,7 @@ build_libretro_generic_makefile() { if [ $? -eq 0 ]; then echo success! - cp ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT} + cp -v ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT} else echo error while compiling $1 fi @@ -241,7 +241,7 @@ build_libretro_generic_gl_makefile() { if [ $? -eq 0 ]; then echo success! - cp ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT} + cp -v ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT} else echo error while compiling $1 fi @@ -406,7 +406,18 @@ while read line; do else BUILD="YES" fi - if [ "${PREVCORE}" == "BSNES" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then + + if [ "${PREVCORE}" == "bsnes" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then + FORCE="YES" + BUILD="YES" + fi + + if [ "${PREVCORE}" == "mame" -a "${PREVBUILD}" == "YES" -a "${NAME}" == "mess" ]; then + FORCE="YES" + BUILD="YES" + fi + + if [ "${PREVCORE}" == "mess" -a "${PREVBUILD}" == "YES" -a "${NAME}" == "ume" ]; then FORCE="YES" BUILD="YES" fi @@ -469,7 +480,7 @@ while read line; do fi cd "${BASE_DIR}" - PREVCORE=$COMMAND + PREVCORE=$NAME PREVBUILD=$BUILD diff --git a/recipes/recipes.win-mingw64-seh b/recipes/recipes.win-mingw64-seh index 9a725a1b..f7f350e4 100644 --- a/recipes/recipes.win-mingw64-seh +++ b/recipes/recipes.win-mingw64-seh @@ -13,7 +13,6 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_ALT Makefile . -dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 @@ -41,7 +40,6 @@ nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PRO o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC Makefile . pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC Makefile.libretro . USE_DYNAREC=0 picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro . -prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile . prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC Makefile . quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git PROJECT YES GENERIC Makefile . diff --git a/recipes/recipes.win-mingw64-sjlj b/recipes/recipes.win-mingw64-sjlj index 2a3caf89..704e2ef7 100644 --- a/recipes/recipes.win-mingw64-sjlj +++ b/recipes/recipes.win-mingw64-sjlj @@ -1,3 +1,5 @@ -mame libretro-mame https://github.com/libretro/mame.git PROJECT NO GENERIC Makefile.libretro . TARGET=mame PTR64=1 +dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . +mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1 PARTIAL=1 mess libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=1 PARTIAL=1 ume libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=1 PARTIAL=1 +prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile . From 56f1e601a28367c9716070db8080b780ba5ac2e4 Mon Sep 17 00:00:00 2001 From: AndresSM Date: Sun, 9 Nov 2014 09:48:36 -0800 Subject: [PATCH 3/3] fix mame --- recipes/recipes.win-mingw64-sjlj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes.win-mingw64-sjlj b/recipes/recipes.win-mingw64-sjlj index 704e2ef7..8b9ef8b1 100644 --- a/recipes/recipes.win-mingw64-sjlj +++ b/recipes/recipes.win-mingw64-sjlj @@ -1,5 +1,5 @@ dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . -mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1 PARTIAL=1 +mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1 PARTIAL=0 mess libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=1 PARTIAL=1 ume libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=1 PARTIAL=1 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile .