From 9060a70b20322f098e6e0ef7efd4c27cf22b5dc1 Mon Sep 17 00:00:00 2001 From: Nikos Chantziaras Date: Wed, 25 Mar 2020 13:40:20 +0200 Subject: [PATCH] dosbox_core: move back from noccache to generic recipes --- recipes/windows/cores-windows-x64_seh-generic | 1 + recipes/windows/cores-windows-x64_seh-noccache | 1 - recipes/windows/cores-windows-x86_dw2-generic | 1 + recipes/windows/cores-windows-x86_dw2-noccache | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic index aeef6bdf..3f039dcf 100644 --- a/recipes/windows/cores-windows-x64_seh-generic +++ b/recipes/windows/cores-windows-x64_seh-generic @@ -22,6 +22,7 @@ boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Ma boom3_xp libretro-boom3_xp https://github.com/libretro/boom3.git master YES GENERIC Makefile neo D3XP=ON dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE sln build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release -G\"Visual Studio 15 2017 Win64\" +dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x64 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro diff --git a/recipes/windows/cores-windows-x64_seh-noccache b/recipes/windows/cores-windows-x64_seh-noccache index 0dea39f8..44840d5a 100644 --- a/recipes/windows/cores-windows-x64_seh-noccache +++ b/recipes/windows/cores-windows-x64_seh-noccache @@ -1,5 +1,4 @@ citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_libretro citra_canary libretro-citra_canary https://github.com/libretro/citra.git canary YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_canary_libretro -dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x64 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro . thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE="Release" diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic index a9a2fe7a..bb3dc079 100644 --- a/recipes/windows/cores-windows-x86_dw2-generic +++ b/recipes/windows/cores-windows-x86_dw2-generic @@ -20,6 +20,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Makefile neo dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile . +dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x86 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro diff --git a/recipes/windows/cores-windows-x86_dw2-noccache b/recipes/windows/cores-windows-x86_dw2-noccache index 3fb38115..8b137891 100644 --- a/recipes/windows/cores-windows-x86_dw2-noccache +++ b/recipes/windows/cores-windows-x86_dw2-noccache @@ -1 +1 @@ -dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro STATIC_LIBCXX=1 BUNDLED_AUDIO_CODECS=0 BUNDLED_LIBSNDFILE=0 STATIC_PACKAGES=1 EXTRA_PACKAGES="ogg iconv" CMAKE_GENERATOR="MSYS Makefiles" WITH_DYNAREC=x86 +