diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 5b466d22..756c02d9 100644
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -8,7 +8,29 @@
 # eg: FORCE=YES MAKE=mingw32-make ./libretro-fetch-and-build.sh buildbot.conf
 
 ####environment configuration:
-echo configuring build environment
+echo "Setting up Environment for $1"
+echo ============================================
+
+ORIGPATH=$PATH
+
+echo Original PATH: $PATH
+
+while read line; do
+    KEY=`echo $line | cut --fields=1 --delimiter=" "`
+    VALUE=`echo $line | cut --fields=2 --delimiter=" "`
+
+    if [ "${KEY}" == "PATH" ];
+    then
+        export PATH=${ORIGPATH}:${VALUE}
+        echo New PATH: $PATH
+
+    else
+        export ${KEY}=${VALUE}
+        echo $KEY: $VALUE   
+     
+    fi
+done  < $1.conf
+
 . ./libretro-config.sh
 
 echo
@@ -142,11 +164,12 @@ build_libretro_generic_makefile() {
     cd $DIR
     cd $SUBDIR
 
+
     if [ -z "${NOCLEAN}" ]; 
     then
 	echo "cleaning up..."
-        echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} clean"
-	${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} clean
+        echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS} clean"
+	${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS} ${ARGS} clean
 	if [ $? -eq 0 ];
         then 
             echo success!
@@ -156,7 +179,7 @@ build_libretro_generic_makefile() {
     fi
 
     echo "compiling..."
-    if [ -z ${ARGS} ];
+    if [ -z "${ARGS}" ]
     then
         echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}"
         ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}
@@ -172,6 +195,7 @@ build_libretro_generic_makefile() {
     else
         echo error while compiling $1
     fi
+ 
 	
 }
 
@@ -185,11 +209,12 @@ build_libretro_generic_gl_makefile() {
     PLATFORM=$5
     ARGS=$6
 
-    cd $DIR
-    cd $SUBDIR
 
     check_opengl
 
+    cd $DIR
+    cd $SUBDIR
+
     if [ -z "${NOCLEAN}" ]; 
     then
 	echo "cleaning up..."
@@ -204,7 +229,7 @@ build_libretro_generic_gl_makefile() {
     fi
 
     echo "compiling..."
-    if [ -z ${ARGS} ];
+    if [ -z "${ARGS}" ];
     then
         echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}"
         ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} ${COMPILER} -j${JOBS}
@@ -222,6 +247,77 @@ build_libretro_generic_gl_makefile() {
     fi
 
     reset_compiler_targets
+
+	
+}
+
+
+build_libretro_bsnes() {
+
+
+    NAME=$1
+    DIR=$2
+    PROFILE=$3
+    MAKEFILE=$4
+    PLATFORM=$5
+    BSNESCOMPILER=$6
+
+
+    cd $DIR
+
+
+    if [ -z "${NOCLEAN}" ]; 
+    then
+	echo "cleaning up..."
+
+        rm -f obj/*.{o,"${FORMAT_EXT}"}
+        rm -f out/*.{o,"${FORMAT_EXT}"}	
+
+
+        if [ "${PROFILE}" == "cpp98" -o "${PROFILE}" == "bnes" ];
+	then
+	    ${MAKE} clean
+	fi
+
+
+        if [ $? -eq 0 ];
+        then 
+            echo success!
+        else
+            echo error while cleaning up
+        fi
+    fi
+
+    echo "compiling..."
+
+
+    if [ "${PROFILE}" == "cpp98" ];
+    then
+        ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
+    elif [ "${PROFILE}" == "bnes" ];
+    then
+        ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}
+    else
+        echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}"
+        ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}
+    fi
+
+    if [ $? -eq 0 ];
+    then 
+        echo success!
+        if [ "${PROFILE}" == "cpp98" ];
+        then
+            cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}"
+        elif [ "${PROFILE}" == "bnes" ];
+        then
+            cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}"
+        else
+            cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro$FORMAT.${FORMAT_EXT}
+        fi
+    else
+        echo error while compiling $1
+    fi
+
 	
 }
 
@@ -290,6 +386,8 @@ while read line; do
            ARGS="${ARGS} ${TEMP}"
         fi
 
+	ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"  
+
         echo ARGS: $ARGS
 	echo
 	echo
@@ -308,6 +406,13 @@ while read line; do
        	        else
 		    BUILD="YES"
                 fi
+                if [ "${PREVCORE}" == "BSNES" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then
+                    FORCE="YES"
+                    BUILD="YES"
+                else
+                    FORCE="NO"
+                fi
+
 
                 cd ..
 
@@ -354,6 +459,8 @@ while read line; do
                     build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
 	    elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
 		    build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
+	    elif [ "${COMMAND}" == "BSNES" ]; then
+		    build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
 
 	    fi
 	else
@@ -364,7 +471,10 @@ while read line; do
     fi
     
     cd "${BASE_DIR}"
+    PREVCORE=$COMMAND
+    PREVBUILD=$BUILD
     
 
 done  < $1
 
+PATH=$ORIGPATH
diff --git a/recipes/recipes.info b/recipes/recipes.info
index d8915640..03a12f85 100644
--- a/recipes/recipes.info
+++ b/recipes/recipes.info
@@ -1,16 +1,30 @@
 RECIPE FORMAT:
-CORENAME COREDIR URL REPOTYPE ENABLED COMMAND MAKEFILE SUBDIR
+CORENAME COREDIR URL REPOTYPE ENABLED COMMAND MAKEFILE SUBDIR ARGS
 
 The following are know to work for Windows x64 with the toolchain provided by MSYS2 by default (SEH exception model):
 
+2048 libretro-2048  https://github.com/libretro/libretro-2048.git PROJECT NO GENERIC Makefile.libretro .
+3dengine libretro-3dengine  https://github.com/libretro/libretro-3dengine.git PROJECT NO GENERIC_GL Makefile .
 4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT NO GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT NO GENERIC Makefile.libretro .
-bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT NO BSNES Makefile .
+bnes libretro-bnes https://github.com/libretro/bnes-libretro.git PROJECT YES BSNES Makefile . bnes
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . accuracy
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . balanced
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . performance
+bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git PROJECT YES BSNES Makefile . cpp98
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . accuracy
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . balanced
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance
+catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT NO GENERIC Makefile .
+desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT NO GENERIC Makefile.libretro desmume
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT NO GENERIC_ALT Makefile .
+dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT NO GENERIC Makefile.libretro .
 fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk
 fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/cps1
 fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/cps2
 fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT NO GENERIC Makefile.libretro .
+ffmpeg libretro-ffmpeg  https://github.com/libretro/FFmpeg.git PROJECT NO GENERIC_GL Makefile libretro
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT NO GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT NO GENERIC_ALT Makefile.libretro libgambatte
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT NO GENERIC Makefile.libretro .
@@ -25,19 +39,26 @@ mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-li
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT NO GENERIC Makefile .
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT NO GENERIC Makefile .
 mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT NO GENERIC Makefile .
+meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT NO GENERIC Makefile libretro
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT NO GENERIC_GL Makefile . WITH_DYNAREC=x86_64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT NO GENERIC Makefile libretro
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT NO GENERIC Makefile .
 o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT NO GENERIC Makefile .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT NO GENERIC Makefile.libretro . USE_DYNAREC=0
-picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro .
+picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE NO GENERIC Makefile.libretro .
+prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT NO GENERIC_ALT Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT NO GENERIC Makefile .
+quicknes libretro-quicknes  https://github.com/libretro/QuickNES_Core.git PROJECT NO GENERIC Makefile libretro
+remotejoy libretro-remotejoy  https://github.com/libretro/libretro-remotejoy.git PROJECT NO GENERIC Makefile .
+scummvm libretro-scummvm  https://github.com/libretro/scummvm.git PROJECT NO GENERIC Makefile backends/platform/libretro/build
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT NO GENERIC Makefile libretro
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT NO GENERIC_ALT Makefile.libretro .
+stella libretro-stella  https://github.com/libretro/stella-libretro.git PROJECT NO GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT NO GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT NO GENERIC Makefile.libretro .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT NO GENERIC_ALT Makefile.libretro .
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT NO GENERIC_ALT Makefile src/libretro
+vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT NO GENERIC Makefile.libretro .
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT NO GENERIC Makefile .
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT NO GENERIC Makefile libretro
 
@@ -50,5 +71,3 @@ mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Make
 The following are not working for Windows x64 at the moment
 
 catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT NO GENERIC Makefile . ===>BROKEN
-desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT NO GENERIC Makefile.libretro desmume ===>BROKEN
-dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT NO GENERIC Makefile.libretro . ===>BROKEN
diff --git a/recipes/recipes.win-mingw64-seh b/recipes/recipes.win-mingw64-seh
index 0efa49df..9a725a1b 100644
--- a/recipes/recipes.win-mingw64-seh
+++ b/recipes/recipes.win-mingw64-seh
@@ -1,46 +1,58 @@
-4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT NO GENERIC Makefile .
-bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT NO GENERIC Makefile.libretro .
-bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT NO BSNES Makefile .
-catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT NO GENERIC Makefile . ===>BROKEN
-desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT NO GENERIC Makefile.libretro desmume ===>BROKEN
-dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT NO GENERIC_ALT Makefile .
-dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT NO GENERIC Makefile.libretro . ===>BROKEN
-fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk
-fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/cps1
-fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/cps2
-fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT NO GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo
-fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT NO GENERIC Makefile .
-gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT NO GENERIC_ALT Makefile.libretro libgambatte
-genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT NO GENERIC Makefile.libretro .
-handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT NO GENERIC Makefile .
-mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT NO GENERIC Makefile .
-mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT NO GENERIC Makefile .
-mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT NO GENERIC_GL Makefile . WITH_DYNAREC=x86_64
-nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT NO GENERIC Makefile libretro
-nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT NO GENERIC Makefile .
-o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT NO GENERIC Makefile .
-pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT NO GENERIC Makefile.libretro . USE_DYNAREC=0
-picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE NO GENERIC Makefile.libretro .
-prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT NO GENERIC Makefile .
-snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT NO GENERIC Makefile libretro
-snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT NO GENERIC_ALT Makefile.libretro .
-tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT NO GENERIC Makefile .
-tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT NO GENERIC Makefile.libretro .
-vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT NO GENERIC_ALT Makefile.libretro .
-vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT NO GENERIC_ALT Makefile src/libretro
-virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT NO GENERIC Makefile .
-yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT NO GENERIC Makefile libretro
-meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC Makefile libretro ===>BROKEN
+2048 libretro-2048  https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC Makefile.libretro .
+3dengine libretro-3dengine  https://github.com/libretro/libretro-3dengine.git PROJECT YES GENERIC_GL Makefile .
+4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC Makefile .
+bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT YES GENERIC Makefile.libretro .
+bnes libretro-bnes https://github.com/libretro/bnes-libretro.git PROJECT YES BSNES Makefile . bnes
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . accuracy
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . balanced
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . performance
+bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git PROJECT YES BSNES Makefile . cpp98
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . accuracy
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . balanced
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance
+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
+fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro .
+ffmpeg libretro-ffmpeg  https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro
+fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile .
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte
+genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro .
+handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile .
+mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile .
+meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC Makefile libretro
+mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
+nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro
+nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile .
+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 .
+scummvm libretro-scummvm  https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build
+snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC Makefile libretro
+snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
 stella libretro-stella  https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile .
+tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile .
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile.libretro .
+vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
+vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro .
-
-
+virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile .
+yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro
diff --git a/recipes/recipes.win-mingw64-seh.conf b/recipes/recipes.win-mingw64-seh.conf
new file mode 100644
index 00000000..b006e67d
--- /dev/null
+++ b/recipes/recipes.win-mingw64-seh.conf
@@ -0,0 +1,2 @@
+PATH /mingw64/bin
+platform MINGW64
diff --git a/recipes/recipes.win-mingw64-sjlj b/recipes/recipes.win-mingw64-sjlj
index 083e7fe6..2a3caf89 100644
--- a/recipes/recipes.win-mingw64-sjlj
+++ b/recipes/recipes.win-mingw64-sjlj
@@ -1,3 +1,3 @@
-mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=1
-mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=1
-mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=1
+mame libretro-mame https://github.com/libretro/mame.git PROJECT NO GENERIC Makefile.libretro . TARGET=mame PTR64=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
diff --git a/recipes/recipes.win-mingw64-sjlj.conf b/recipes/recipes.win-mingw64-sjlj.conf
new file mode 100644
index 00000000..82fb11f9
--- /dev/null
+++ b/recipes/recipes.win-mingw64-sjlj.conf
@@ -0,0 +1,2 @@
+PATH /c/Tools/mingw64/bin:/c/Tools/python64
+platform MINGW64