Update Mednafen to 0.9.48

Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.47</string>
+	<string>0.9.48</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>

Mednafen.xcodeproj/project.pbxproj

@@ -4645,9 +4645,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"0.9.47\\\"",
+					"-DMEDNAFEN_VERSION=\\\"0.9.48\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00094700",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00094800",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",
@@ -4708,9 +4708,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"0.9.47\\\"",
+					"-DMEDNAFEN_VERSION=\\\"0.9.48\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00094700",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00094800",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",

include/trio_external/trio.h

@@ -0,0 +1 @@
+#include <trio.h>

include/trio_external/triodef.h

@@ -0,0 +1 @@
+#include <triodef.h>

include/trio_external/trionan.h

@@ -0,0 +1 @@
+#include <trionan.h>

include/trio_external/triop.h

@@ -0,0 +1 @@
+#include <triop.h>

include/trio_external/triostr.h

@@ -0,0 +1 @@
+#include <triostr.h>

mednafen/Makefile.am

@@ -1,14 +1,14 @@
-SUBDIRS	= trio
 AUTOMAKE_OPTIONS = subdir-objects
 DEFS = @DEFS@ @SNDFILE_CFLAGS@
 DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_builddir)/intl
 
 bin_PROGRAMS	=	mednafen
 
-mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp Time.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp SSFLoader.cpp SNSFLoader.cpp SPCReader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
-mednafen_LDADD 		= 	trio/libtrio.a
-mednafen_DEPENDENCIES	=	trio/libtrio.a
+SUBDIRS			=
 noinst_LIBRARIES	=
+mednafen_LDADD		=
+mednafen_DEPENDENCIES	=
+mednafen_SOURCES 	= 	debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp Time.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp SSFLoader.cpp SNSFLoader.cpp SPCReader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
 
 if HAVE_SDL
 SUBDIRS 		+=	drivers
@@ -121,9 +121,7 @@ endif
 
 
 if WANT_DEBUGGER
-SUBDIRS += desa68
-mednafen_LDADD		+=	desa68/libdesa68.a
-mednafen_DEPENDENCIES	+=	desa68/libdesa68.a
+include desa68/Makefile.am.inc
 endif
 
 include hw_cpu/Makefile.am.inc
@@ -133,11 +131,7 @@ include hw_video/Makefile.am.inc
 include cdrom/Makefile.am.inc
 include sound/Makefile.am.inc
 include net/Makefile.am.inc
-
-SUBDIRS                 +=      quicklz
-mednafen_LDADD          +=      quicklz/libmdfnquicklz.a
-mednafen_DEPENDENCIES   +=      quicklz/libmdfnquicklz.a
-
+include quicklz/Makefile.am.inc
 include compress/Makefile.am.inc
 include hash/Makefile.am.inc
 include string/Makefile.am.inc
@@ -149,17 +143,19 @@ include cheat_formats/Makefile.am.inc
 if HAVE_EXTERNAL_TREMOR
 mednafen_LDADD		+=	@TREMOR_LIBS@
 else
-SUBDIRS += tremor
-mednafen_LDADD          +=      tremor/libvorbisidec.a
-mednafen_DEPENDENCIES   +=      tremor/libvorbisidec.a
+include tremor/Makefile.am.inc
 endif
 
 if HAVE_EXTERNAL_MPCDEC
 mednafen_LDADD		+=	@MPCDEC_LIBS@
 else
-SUBDIRS += mpcdec
-mednafen_LDADD          +=      mpcdec/libmpcdec.a
-mednafen_DEPENDENCIES   +=      mpcdec/libmpcdec.a
+include mpcdec/Makefile.am.inc
+endif
+
+if HAVE_EXTERNAL_TRIO
+mednafen_LDADD		+=	@TRIO_LIBS@
+else
+include trio/Makefile.am.inc
 endif
 
 mednafen_LDADD		+= 	@SNDFILE_LIBS@ @ZLIB_LIBS@ @LIBINTL@ @LIBICONV@

mednafen/cdrom/CDAFReader_MPC.cpp

@@ -52,8 +52,6 @@ class CDAFReader_MPC final : public CDAFReader
  Stream *fw;
 };
 
-
-/// Reads size bytes of data into buffer at ptr.
 static mpc_int32_t impc_read(mpc_reader *p_reader, void *ptr, mpc_int32_t size)
 {
  Stream *fw = (Stream*)(p_reader->data);
@@ -64,27 +62,25 @@ static mpc_int32_t impc_read(mpc_reader *p_reader, void *ptr, mpc_int32_t size)
  }
  catch(...)
  {
-  return(MPC_STATUS_FAIL);
+  return MPC_STATUS_FAIL;
  }
 }
 
-/// Seeks to byte position offset.
 static mpc_bool_t impc_seek(mpc_reader *p_reader, mpc_int32_t offset)
 {
  Stream *fw = (Stream*)(p_reader->data);
 
  try
  {
   fw->seek(offset, SEEK_SET);
-  return(MPC_TRUE);
+  return MPC_TRUE;
  }
  catch(...)
  {
-  return(MPC_FALSE);
+  return MPC_FALSE;
  }
 }
 
-/// Returns the current byte offset in the stream.
 static mpc_int32_t impc_tell(mpc_reader *p_reader)
 {
  Stream *fw = (Stream*)(p_reader->data);
@@ -95,11 +91,10 @@ static mpc_int32_t impc_tell(mpc_reader *p_reader)
  }
  catch(...)
  {
-  return(MPC_STATUS_FAIL);
+  return MPC_STATUS_FAIL;
  }
 }
 
-/// Returns the total length of the source stream, in bytes.
 static mpc_int32_t impc_get_size(mpc_reader *p_reader)
 {
  Stream *fw = (Stream*)(p_reader->data);
@@ -110,14 +105,13 @@ static mpc_int32_t impc_get_size(mpc_reader *p_reader)
  }
  catch(...)
  {
-  return(MPC_STATUS_FAIL);
+  return MPC_STATUS_FAIL;
  }
 }
 
-/// True if the stream is a seekable stream.
 static mpc_bool_t impc_canseek(mpc_reader *p_reader)
 {
- return(MPC_TRUE);
+ return MPC_TRUE;
 }
 
 CDAFReader_MPC::CDAFReader_MPC(Stream *fp) : fw(fp)
@@ -225,14 +219,14 @@ bool CDAFReader_MPC::Seek_(uint64 frame_offset)
  MPCBufferIn = 0;
 
  if(mpc_demux_seek_sample(demux, frame_offset) < 0)
-  return(false);
+  return false;
 
- return(true);
+ return true;
 }
 
 uint64 CDAFReader_MPC::FrameCount(void)
 {
- return(mpc_streaminfo_get_length_samples(&si));
+ return mpc_streaminfo_get_length_samples(&si);
 }
 
 

mednafen/desa68/Makefile.am.inc

@@ -0,0 +1,8 @@
+noinst_LIBRARIES	+=	libdesa68.a
+libdesa68_a_CFLAGS	=	@AM_CFLAGS@ -Wno-multichar
+
+libdesa68_a_SOURCES	=	desa68/desa68.c
+
+mednafen_LDADD		+=	libdesa68.a
+mednafen_DEPENDENCIES	+=	libdesa68.a
+