diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic
index d8723b6c..19ea8650 100644
--- a/recipes/windows/cores-windows-x64_seh-generic
+++ b/recipes/windows/cores-windows-x64_seh-generic
@@ -25,7 +25,6 @@ fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GEN
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
-glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 
 gme libretro-gme https://github.com/libretro/libretro-gme.git SUBMODULE YES GENERIC Makefile . 
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . 
 handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/windows/cores-windows-x64_w32-generic b/recipes/windows/cores-windows-x64_w32-generic
deleted file mode 100644
index 944cad33..00000000
--- a/recipes/windows/cores-windows-x64_w32-generic
+++ /dev/null
@@ -1,67 +0,0 @@
-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 
-craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
-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 . 
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
-fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
-fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git PROJECT YES GENERIC makefile.libretro . 
-fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git PROJECT YES GENERIC makefile.libretro . 
-fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git PROJECT YES GENERIC Makefile . 
-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 . 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES GENERIC Makefile.libretro . 
-gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile 
-genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
-glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 
-gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . 
-handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . 
-hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT YES GENERIC Makefile.libretro . 
-imageviewer libretro-imageviewer https://github.com/libretro/imageviewer-libretro.git PROJECT YES GENERIC Makefile.libretro . 
-mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_wswan libretro-beetle_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 
-mgba libretro-mgba https://github.com/libretro/mgba.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 . 
-puae libretro-uae https://github.com/libretro/libretro-uae.git PROJECT YES GENERIC Makefile . 
-quicknes libretro-quicknes  https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile . 
-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 
-snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git PROJECT YES GENERIC Makefile . 
-snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git PROJECT YES GENERIC_ALT Makefile.libretro . 
-snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC 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 . 
-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/windows/cores-windows-x64_w32-generic.conf b/recipes/windows/cores-windows-x64_w32-generic.conf
deleted file mode 100644
index 098d0608..00000000
--- a/recipes/windows/cores-windows-x64_w32-generic.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-PATH /home/buildbot/tools/mingw64_win32/bin:/home/buildbot/tools/python
-MINGW64 /home/buildbot/tools/mingw64_posix/
-ARCH x86_64
-platform MINGW64
-PLATFORM windows
-MAKE mingw32-make.exe
-CC gcc
-CXX g++
-CXX11 g++
-PTR64 1
-CORE_JOB YES
diff --git a/recipes/windows/cores-windows-x64_w32_seh-generic b/recipes/windows/cores-windows-x64_w32_seh-generic
new file mode 100644
index 00000000..5d7aacb7
--- /dev/null
+++ b/recipes/windows/cores-windows-x64_w32_seh-generic
@@ -0,0 +1 @@
+glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 
diff --git a/recipes/windows/cores-windows-x64_w32_seh-generic.conf b/recipes/windows/cores-windows-x64_w32_seh-generic.conf
new file mode 100644
index 00000000..3b9e7422
--- /dev/null
+++ b/recipes/windows/cores-windows-x64_w32_seh-generic.conf
@@ -0,0 +1,9 @@
+PATH /mingw64_w64/bin
+platform MINGW64
+PLATFORM windows
+ARCH x86_64
+MAKE make.exe
+CC gcc
+CXX g++
+CXX11 g++
+CORE_JOB YES
diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic
index d477439d..f02cc4f3 100644
--- a/recipes/windows/cores-windows-x86_dw2-generic
+++ b/recipes/windows/cores-windows-x86_dw2-generic
@@ -22,7 +22,6 @@ fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GEN
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES GENERIC Makefile.libretro .  
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
-glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86 
 gme libretro-gme https://github.com/libretro/libretro-gme.git SUBMODULE YES GENERIC Makefile . 
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . 
 handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/windows/cores-windows-x86_w32_dw2-generic b/recipes/windows/cores-windows-x86_w32_dw2-generic
new file mode 100644
index 00000000..a16276cb
--- /dev/null
+++ b/recipes/windows/cores-windows-x86_w32_dw2-generic
@@ -0,0 +1 @@
+glupen64 libretro-glupen64 https://github.com/loganmc10/GLupeN64.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86 
diff --git a/recipes/windows/cores-windows-x86_w32_dw2-generic.conf b/recipes/windows/cores-windows-x86_w32_dw2-generic.conf
new file mode 100644
index 00000000..2ad2c575
--- /dev/null
+++ b/recipes/windows/cores-windows-x86_w32_dw2-generic.conf
@@ -0,0 +1,9 @@
+PATH /mingw32_w32/bin/
+platform MINGW32
+PLATFORM windows
+ARCH x86
+MAKE mingw32-make.exe
+CC gcc
+CXX g++
+CXX11 g++
+CORE_JOB YES