From 762604d041dd17695effc089588d77905b33d5cd Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Thu, 24 Aug 2017 17:36:35 +0100 Subject: [PATCH] add/update msvc2017 targets to have both desktop and uwp variants --- libretro-build-msvc2005_x86.sh | 0 libretro-build-msvc2017_x64.sh | 17 --------- libretro-config.sh | 38 +++++++++++++++++-- .../cores-windows-msvc2010-x64_seh-generic | 35 +++++++++++++++++ ...ores-windows-msvc2010-x64_seh-generic.conf | 10 +++++ ...-windows-msvc2017-desktop-x64_seh-generic} | 0 ...dows-msvc2017-desktop-x64_seh-generic.conf | 10 +++++ ...s-windows-msvc2017-desktop-x86_dw2-generic | 1 + ...dows-msvc2017-desktop-x86_dw2-generic.conf | 10 +++++ ...cores-windows-msvc2017-uwp-x64_seh-generic | 1 + ...-windows-msvc2017-uwp-x64_seh-generic.conf | 10 +++++ ...cores-windows-msvc2017-uwp-x86_dw2-generic | 1 + ...windows-msvc2017-uwp-x86_dw2-generic.conf} | 4 +- 13 files changed, 114 insertions(+), 23 deletions(-) mode change 100644 => 100755 libretro-build-msvc2005_x86.sh delete mode 100644 libretro-build-msvc2017_x64.sh create mode 100644 recipes/windows/cores-windows-msvc2010-x64_seh-generic create mode 100644 recipes/windows/cores-windows-msvc2010-x64_seh-generic.conf rename recipes/windows/{cores-windows-msvc2017-x64_dw2-generic => cores-windows-msvc2017-desktop-x64_seh-generic} (100%) create mode 100644 recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic.conf create mode 100644 recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic create mode 100644 recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic.conf create mode 100644 recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic create mode 100644 recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic.conf create mode 100644 recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic rename recipes/windows/{cores-windows-msvc2017-x64_dw2-generic.conf => cores-windows-msvc2017-uwp-x86_dw2-generic.conf} (78%) diff --git a/libretro-build-msvc2005_x86.sh b/libretro-build-msvc2005_x86.sh old mode 100644 new mode 100755 diff --git a/libretro-build-msvc2017_x64.sh b/libretro-build-msvc2017_x64.sh deleted file mode 100644 index 1b0ea759..00000000 --- a/libretro-build-msvc2017_x64.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /usr/bin/env bash -# vim: set ts=3 sw=3 noet ft=sh : bash - -SCRIPT="${0#./}" -BASE_DIR="${SCRIPT%/*}" -WORKDIR="$PWD" - -if [ "$BASE_DIR" = "$SCRIPT" ]; then - BASE_DIR="$WORKDIR" -else - if [[ "$0" != /* ]]; then - # Make the path absolute - BASE_DIR="$WORKDIR/$BASE_DIR" - fi -fi - -platform=msvc2017_x64 ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-config.sh b/libretro-config.sh index 1081e199..389b6eea 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -658,12 +658,42 @@ case "$platform" in CXX="cl.exe" CXX11="cl.exe" ;; - msvc2017_x64) - platform=windows_msvc2017_x64 + msvc2017_desktop_x86) + platform=windows_msvc2017_desktop_x86 FORMAT_EXT="dll" BINARY_EXT=".exe" - FORMAT_COMPILER_TARGET="windows_msvc2017_x64" - DIST_DIR="msvc2017_x64" + FORMAT_COMPILER_TARGET="windows_msvc2017_desktop_x86" + DIST_DIR="msvc2017_desktop_x86" + CC="cl.exe" + CXX="cl.exe" + CXX11="cl.exe" + ;; + msvc2017_desktop_x64) + platform=windows_msvc2017_desktop_x64 + FORMAT_EXT="dll" + BINARY_EXT=".exe" + FORMAT_COMPILER_TARGET="windows_msvc2017_desktop_x64" + DIST_DIR="msvc2017_desktop_x64" + CC="cl.exe" + CXX="cl.exe" + CXX11="cl.exe" + ;; + msvc2017_uwp_x86) + platform=windows_msvc2017_uwp_x86 + FORMAT_EXT="dll" + BINARY_EXT=".exe" + FORMAT_COMPILER_TARGET="windows_msvc2017_uwp_x86" + DIST_DIR="msvc2017_uwp_x86" + CC="cl.exe" + CXX="cl.exe" + CXX11="cl.exe" + ;; + msvc2017_uwp_x64) + platform=windows_msvc2017_uwp_x64 + FORMAT_EXT="dll" + BINARY_EXT=".exe" + FORMAT_COMPILER_TARGET="windows_msvc2017_uwp_x64" + DIST_DIR="msvc2017_uwp_x64" CC="cl.exe" CXX="cl.exe" CXX11="cl.exe" diff --git a/recipes/windows/cores-windows-msvc2010-x64_seh-generic b/recipes/windows/cores-windows-msvc2010-x64_seh-generic new file mode 100644 index 00000000..0cc33752 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2010-x64_seh-generic @@ -0,0 +1,35 @@ +2048 libretro-2048 https://github.com/libretro/libretro-2048.git master PROJECT YES GENERIC Makefile.libretro . +3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master PROJECT YES GENERIC Makefile . +4do libretro-4do https://github.com/libretro/4do-libretro.git master PROJECT YES GENERIC Makefile . +bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master PROJECT YES GENERIC Makefile.libretro . +craft libretro-craft https://github.com/libretro/craft master PROJECT YES GENERIC Makefile.libretro . +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git master PROJECT YES GENERIC Makefile.libretro . +fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master PROJECT YES GENERIC Makefile . +gme libretro-gme https://github.com/libretro/libretro-gme.git master SUBMODULE YES GENERIC Makefile . +gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master PROJECT YES GENERIC Makefile . +genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master PROJECT YES GENERIC Makefile.libretro . +handy libretro-handy https://github.com/libretro/libretro-handy.git master PROJECT YES GENERIC Makefile . +mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master PROJECT YES GENERIC Makefile . +mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master PROJECT YES GENERIC Makefile . +mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master PROJECT YES GENERIC Makefile . +mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master PROJECT YES GENERIC Makefile . +mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master PROJECT YES GENERIC Makefile . +mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master PROJECT YES GENERIC Makefile . +melonds libretro-melonds https://github.com/libretro/melonDS.git master PROJECT YES GENERIC Makefile . +parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86 +nestopia libretro-nestopia https://github.com/libretro/nestopia.git master PROJECT YES GENERIC Makefile libretro +nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master PROJECT YES GENERIC Makefile . +o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master PROJECT YES GENERIC Makefile . +pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master PROJECT YES GENERIC Makefile . +prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master PROJECT YES GENERIC_ALT Makefile . +prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master PROJECT YES GENERIC Makefile . +pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master SUBMODULE YES GENERIC Makefile . +quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master PROJECT YES GENERIC Makefile . +snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master PROJECT YES GENERIC_ALT Makefile.libretro . +stella libretro-stella https://github.com/libretro/stella-libretro.git master PROJECT YES GENERIC Makefile . +tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master PROJECT YES GENERIC Makefile . +vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master PROJECT YES GENERIC Makefile.libretro . +tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master PROJECT YES GENERIC Makefile . +vba_next libretro-vba_next https://github.com/libretro/vba-next.git master PROJECT YES GENERIC_ALT Makefile.libretro . +virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master PROJECT YES GENERIC Makefile . +xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master PROJECT YES GENERIC Makefile . diff --git a/recipes/windows/cores-windows-msvc2010-x64_seh-generic.conf b/recipes/windows/cores-windows-msvc2010-x64_seh-generic.conf new file mode 100644 index 00000000..203a25a3 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2010-x64_seh-generic.conf @@ -0,0 +1,10 @@ +PATH /mingw64/lib/ccache/bin:/mingw64/bin +MSYSTEM MINGW64 +platform msvc2010_x64 +PLATFORM windows +ARCH x86 +MAKE make.exe +CC gcc +CXX g++ +CXX11 g++ +CORE_JOB YES diff --git a/recipes/windows/cores-windows-msvc2017-x64_dw2-generic b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic similarity index 100% rename from recipes/windows/cores-windows-msvc2017-x64_dw2-generic rename to recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic.conf b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic.conf new file mode 100644 index 00000000..b6defefd --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic.conf @@ -0,0 +1,10 @@ +PATH /mingw64/lib/ccache/bin:/mingw64/bin +MSYSTEM MINGW64 +platform msvc2017_desktop_x64 +PLATFORM windows +ARCH x86_64 +MAKE make.exe +CC gcc +CXX g++ +CXX11 g++ +CORE_JOB YES diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic new file mode 100644 index 00000000..cce99537 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic @@ -0,0 +1 @@ +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git master PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic.conf b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic.conf new file mode 100644 index 00000000..064b4a77 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic.conf @@ -0,0 +1,10 @@ +PATH /mingw32/lib/ccache/bin:/mingw32/bin +MSYSTEM MINGW32 +platform msvc2017_desktop_x86 +PLATFORM windows +ARCH x86 +MAKE make.exe +CC gcc +CXX g++ +CXX11 g++ +CORE_JOB YES diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic new file mode 100644 index 00000000..cce99537 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic @@ -0,0 +1 @@ +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git master PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic.conf b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic.conf new file mode 100644 index 00000000..3cad93c7 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic.conf @@ -0,0 +1,10 @@ +PATH /mingw64/lib/ccache/bin:/mingw64/bin +MSYSTEM MINGW64 +platform msvc2017_uwp_x64 +PLATFORM windows +ARCH x86_64 +MAKE make.exe +CC gcc +CXX g++ +CXX11 g++ +CORE_JOB YES diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic new file mode 100644 index 00000000..cce99537 --- /dev/null +++ b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic @@ -0,0 +1 @@ +fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git master PROJECT YES GENERIC Makefile.libretro . diff --git a/recipes/windows/cores-windows-msvc2017-x64_dw2-generic.conf b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic.conf similarity index 78% rename from recipes/windows/cores-windows-msvc2017-x64_dw2-generic.conf rename to recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic.conf index ee046c5d..9102e8cb 100644 --- a/recipes/windows/cores-windows-msvc2017-x64_dw2-generic.conf +++ b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic.conf @@ -1,8 +1,8 @@ PATH /mingw32/lib/ccache/bin:/mingw32/bin MSYSTEM MINGW32 -platform msvc2017_x64 +platform msvc2017_uwp_x86 PLATFORM windows -ARCH x64 +ARCH x86 MAKE make.exe CC gcc CXX g++