diff --git a/Assets/dll/faust.wbx.gz b/Assets/dll/faust.wbx.gz index 9d91f7e29e..fe61d2b6e7 100644 Binary files a/Assets/dll/faust.wbx.gz and b/Assets/dll/faust.wbx.gz differ diff --git a/Assets/dll/hyper.wbx.gz b/Assets/dll/hyper.wbx.gz index 09fd5e052a..3c14c40d17 100644 Binary files a/Assets/dll/hyper.wbx.gz and b/Assets/dll/hyper.wbx.gz differ diff --git a/Assets/dll/ngp.wbx.gz b/Assets/dll/ngp.wbx.gz index 67b082f632..5de6395454 100644 Binary files a/Assets/dll/ngp.wbx.gz and b/Assets/dll/ngp.wbx.gz differ diff --git a/Assets/dll/pcfx.wbx.gz b/Assets/dll/pcfx.wbx.gz index 225ae9b87d..18c1b16452 100644 Binary files a/Assets/dll/pcfx.wbx.gz and b/Assets/dll/pcfx.wbx.gz differ diff --git a/Assets/dll/shock.wbx.gz b/Assets/dll/shock.wbx.gz index 32ad5fc97c..044be8c178 100644 Binary files a/Assets/dll/shock.wbx.gz and b/Assets/dll/shock.wbx.gz differ diff --git a/Assets/dll/ss.wbx.gz b/Assets/dll/ss.wbx.gz index adcc06f586..889d236736 100644 Binary files a/Assets/dll/ss.wbx.gz and b/Assets/dll/ss.wbx.gz differ diff --git a/Assets/dll/turbo.wbx.gz b/Assets/dll/turbo.wbx.gz index fdbb68ff42..8dbbd0ef80 100644 Binary files a/Assets/dll/turbo.wbx.gz and b/Assets/dll/turbo.wbx.gz differ diff --git a/waterbox/nyma/Interfaces.cpp b/waterbox/nyma/Interfaces.cpp index c4a5e721b9..27d00b70f0 100644 --- a/waterbox/nyma/Interfaces.cpp +++ b/waterbox/nyma/Interfaces.cpp @@ -58,7 +58,7 @@ namespace Mednafen case MDFNMKF_SAVBACK: ret += "SAVBACK:"; break; case MDFNMKF_CHEAT: ret += "CHEAT:"; break; case MDFNMKF_PALETTE: ret += "PALETTE:"; break; - case MDFNMKF_IPS: ret += "IPS:"; break; + case MDFNMKF_PATCH: ret += "PATCH:"; break; case MDFNMKF_MOVIE: ret += "MOVIE:"; break; case MDFNMKF_SNAP_DAT: ret += "SNAP_DAT:"; break; case MDFNMKF_CHEAT_TMP: ret += "CHEAT_TMP:"; break; diff --git a/waterbox/nyma/common.mak b/waterbox/nyma/common.mak index 08d27e817b..e9bb3cd865 100644 --- a/waterbox/nyma/common.mak +++ b/waterbox/nyma/common.mak @@ -48,6 +48,7 @@ SRCS := \ $(call cdir,cputest) \ $(call cppdir,compress) \ $(call cppdir,video) \ + $(call cdir,zstd) \ $(filter-out %generate.cpp,$(call cppdir,sound)) \ Interfaces.cpp NymaCore.cpp diff --git a/waterbox/nyma/common/config.h b/waterbox/nyma/common/config.h index dda29401c7..a98b4a41e4 100644 --- a/waterbox/nyma/common/config.h +++ b/waterbox/nyma/common/config.h @@ -117,6 +117,9 @@ /* Define to 1 if you have the `dup2' function. */ #undef HAVE_DUP2 +/* Define if we are compiling and linking with external libzstd. */ +#undef HAVE_EXTERNAL_LIBZSTD + /* Define if we are compiling and linking with external LZO. */ #undef HAVE_EXTERNAL_LZO2 @@ -138,30 +141,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FENV_H -/* Define to 1 if you have the `fopen64' function. */ -#undef HAVE_FOPEN64 - /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK /* Define to 1 if you have the `freeaddrinfo' function. */ #undef HAVE_FREEADDRINFO -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fseeko64' function. */ -#undef HAVE_FSEEKO64 - /* Define to 1 if you have the `fstat64' function. */ #undef HAVE_FSTAT64 -/* Define to 1 if you have the `ftello' function. */ -#undef HAVE_FTELLO - -/* Define to 1 if you have the `ftello64' function. */ -#undef HAVE_FTELLO64 - /* Define to 1 if you have the `ftruncate64' function. */ #undef HAVE_FTRUNCATE64 @@ -244,12 +232,12 @@ /* Define to 1 if you have the `asound' library (-lasound). */ #undef HAVE_LIBASOUND +/* Define if we are compiling with libFLAC support. */ +#undef HAVE_LIBFLAC + /* Define to 1 if you have the `mpcdec' library (-lmpcdec). */ #undef HAVE_LIBMPCDEC -/* Define if we are compiling with libsndfile support. */ -#undef HAVE_LIBSNDFILE - /* Define to 1 if you have the `trio' library (-ltrio). */ #undef HAVE_LIBTRIO @@ -271,6 +259,9 @@ /* Define to 1 if the system has the type `long long int'. */ #define HAVE_LONG_LONG_INT 1 +/* Define to 1 if you have the `lseek64' function. */ +#undef HAVE_LSEEK64 + /* Define to 1 if you have the `madvise' function. */ #undef HAVE_MADVISE @@ -422,6 +413,9 @@ /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION +/* Define to 1 if you have the `siglongjmp' function. */ +#undef HAVE_SIGLONGJMP + /* Define to 1 if you have the `signal' function. */ #undef HAVE_SIGNAL @@ -526,6 +520,9 @@ /* Define to 1 if O_NOFOLLOW works. */ #undef HAVE_WORKING_O_NOFOLLOW +/* Define to 1 if you have the `_longjmp' function. */ +#undef HAVE__LONGJMP + /* Define to 1 if you have the `_mkdir' function. */ #undef HAVE__MKDIR @@ -549,10 +546,10 @@ #undef MDFN_ENABLE_DEV_BUILD /* Mednafen version definition. */ -#define MEDNAFEN_VERSION "1.24.3" +#define MEDNAFEN_VERSION "1.29.0" /* Mednafen version numeric. */ -#define MEDNAFEN_VERSION_NUMERIC 0x00102403 +#define MEDNAFEN_VERSION_NUMERIC 0x00102900 /* Define if config.h is present */ #undef MINILZO_HAVE_CONFIG_H @@ -739,6 +736,9 @@ /* Define if we are compiling with PlayStation emulation. */ #define WANT_PSX_EMU 1 +/* Define if we are compiling with Sega Arcade SCSP Player. */ +#undef WANT_SASPLAY_EMU + /* Define if we are compiling with SMS+GG emulation. */ #define WANT_SMS_EMU 1 diff --git a/waterbox/nyma/common/zstd/zstd.h b/waterbox/nyma/common/zstd/zstd.h new file mode 100644 index 0000000000..003b7acc19 --- /dev/null +++ b/waterbox/nyma/common/zstd/zstd.h @@ -0,0 +1 @@ +#include diff --git a/waterbox/nyma/mednafen b/waterbox/nyma/mednafen index 52c06fc2cf..df8d562ad6 160000 --- a/waterbox/nyma/mednafen +++ b/waterbox/nyma/mednafen @@ -1 +1 @@ -Subproject commit 52c06fc2cfc1f7f0c9d3a5fcbcac3216e40384ca +Subproject commit df8d562ad6adfd9892a642130c0280e1084e22d5