From f0065d1914ede125d50e8a9b57576b4dfc48f9d8 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sat, 3 Apr 2021 02:53:09 -0700 Subject: [PATCH] Updated libsidplayfp to version 2.2.0, plus some extras --- .../residfp-builder/residfp/siddefs-fp.h | 2 +- .../libsidplayfp/generated/src/config.h | 33 ++++++++++++------- .../generated/src/sidplayfp/sidversion.h | 2 +- Frameworks/libsidplayfp/sidplayfp | 2 +- .../sidplayfp.xcodeproj/project.pbxproj | 28 ++++++++-------- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Frameworks/libsidplayfp/generated/src/builders/residfp-builder/residfp/siddefs-fp.h b/Frameworks/libsidplayfp/generated/src/builders/residfp-builder/residfp/siddefs-fp.h index 5c438e54c..62cd250f3 100644 --- a/Frameworks/libsidplayfp/generated/src/builders/residfp-builder/residfp/siddefs-fp.h +++ b/Frameworks/libsidplayfp/generated/src/builders/residfp-builder/residfp/siddefs-fp.h @@ -51,7 +51,7 @@ extern "C" #ifndef __VERSION_CC__ extern const char* residfp_version_string; #else -const char* residfp_version_string = "2.1.0"; +const char* residfp_version_string = "2.2.0"; #endif } diff --git a/Frameworks/libsidplayfp/generated/src/config.h b/Frameworks/libsidplayfp/generated/src/config.h index ac724b2f5..9bb389772 100644 --- a/Frameworks/libsidplayfp/generated/src/config.h +++ b/Frameworks/libsidplayfp/generated/src/config.h @@ -5,7 +5,7 @@ /* #undef AC_APPLE_UNIVERSAL_BUILD */ /* Define for threaded driver */ -#define EXSID_THREADED 1 +/* #undef EXSID_THREADED */ /* Algorithm AES in gcrypt library */ /* #undef GCRYPT_WITH_AES */ @@ -85,12 +85,18 @@ /* Algorithm WHIRLPOOL in gcrypt library */ /* #undef GCRYPT_WITH_WHIRLPOOL */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARM_NEON_H */ + /* define if the compiler supports basic C++11 syntax */ #define HAVE_CXX11 1 /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EMMINTRIN_H */ + /* Define to 1 if you have libexsid (-lexsid). */ /* #undef HAVE_EXSID */ @@ -101,7 +107,7 @@ /* #undef HAVE_FTD2XX_H */ /* Define to 1 if you have ftdi.h */ -#define HAVE_FTDI 1 +/* #undef HAVE_FTDI */ /* Gcrypt library is available */ /* #undef HAVE_GCRYPT */ @@ -109,21 +115,21 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_MMINTRIN_H */ /* Define to 1 if you have pthread.h */ -#define HAVE_PTHREAD_H 1 +/* #undef HAVE_PTHREAD_H */ /* Have PTHREAD_PRIO_INHERIT. */ -#define HAVE_PTHREAD_PRIO_INHERIT 1 +/* #undef HAVE_PTHREAD_PRIO_INHERIT */ /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -170,16 +176,16 @@ #define PACKAGE_NAME "libsidplayfp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libsidplayfp 2.1.0" +#define PACKAGE_STRING "libsidplayfp 2.2.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libsidplayfp" /* Define to the home page for this package. */ -#define PACKAGE_URL "http://sourceforge.net/projects/sidplay-residfp/" +#define PACKAGE_URL "https://github.com/libsidplayfp/libsidplayfp/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.1.0" +#define PACKAGE_VERSION "2.2.0" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -194,11 +200,13 @@ /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.1.0" +#define VERSION "2.2.0" /* Path to VICE testsuite. */ /* #undef VICE_TESTSUITE */ @@ -218,6 +226,7 @@ #if defined(__x86_64__) \ || defined(_M_X64) #define HAVE_MMINTRIN_H 1 +#define HAVE_EMMINTRIN_H 1 #elif (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) #define HAVE_ARM_NEON_H 1 #endif diff --git a/Frameworks/libsidplayfp/generated/src/sidplayfp/sidversion.h b/Frameworks/libsidplayfp/generated/src/sidplayfp/sidversion.h index 297698c0f..054cdbfed 100644 --- a/Frameworks/libsidplayfp/generated/src/sidplayfp/sidversion.h +++ b/Frameworks/libsidplayfp/generated/src/sidplayfp/sidversion.h @@ -8,7 +8,7 @@ #define LIBSIDPLAYFP_VERSION_MAJ 2 -#define LIBSIDPLAYFP_VERSION_MIN 1 +#define LIBSIDPLAYFP_VERSION_MIN 2 #define LIBSIDPLAYFP_VERSION_LEV 0 #endif diff --git a/Frameworks/libsidplayfp/sidplayfp b/Frameworks/libsidplayfp/sidplayfp index 50a673ef6..61c9a88de 160000 --- a/Frameworks/libsidplayfp/sidplayfp +++ b/Frameworks/libsidplayfp/sidplayfp @@ -1 +1 @@ -Subproject commit 50a673ef6643c35f42488c387d393e43c143b1d7 +Subproject commit 61c9a88de942f1ec428177880cc87f39a957aa31 diff --git a/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj b/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj index e435a3f7d..964b5c529 100644 --- a/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj +++ b/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 8354900926186D9E004988A7 /* mos652x.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8354900726186D9E004988A7 /* mos652x.cpp */; }; + 8354900A26186D9E004988A7 /* mos652x.h in Headers */ = {isa = PBXBuildFile; fileRef = 8354900826186D9E004988A7 /* mos652x.h */; }; EDBE900E25E7E7A2001EB4A4 /* sidrandom.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F1225E7E79F001EB4A4 /* sidrandom.h */; }; EDBE900F25E7E7A2001EB4A4 /* reloc65.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDBE8F1325E7E79F001EB4A4 /* reloc65.cpp */; }; EDBE901025E7E7A2001EB4A4 /* reloc65.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F1425E7E79F001EB4A4 /* reloc65.h */; }; @@ -38,8 +40,6 @@ EDBE902B25E7E7A2001EB4A4 /* SerialPort.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3325E7E79F001EB4A4 /* SerialPort.h */; }; EDBE902C25E7E7A2001EB4A4 /* timer.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3425E7E79F001EB4A4 /* timer.h */; }; EDBE902D25E7E7A2001EB4A4 /* interrupt.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3525E7E79F001EB4A4 /* interrupt.h */; }; - EDBE902E25E7E7A2001EB4A4 /* mos6526.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3625E7E79F001EB4A4 /* mos6526.h */; }; - EDBE902F25E7E7A2001EB4A4 /* mos6526.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDBE8F3725E7E79F001EB4A4 /* mos6526.cpp */; }; EDBE903025E7E7A2001EB4A4 /* ExtraSidBank.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3925E7E79F001EB4A4 /* ExtraSidBank.h */; }; EDBE903125E7E7A2001EB4A4 /* SystemROMBanks.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3A25E7E79F001EB4A4 /* SystemROMBanks.h */; }; EDBE903225E7E7A2001EB4A4 /* ColorRAMBank.h in Headers */ = {isa = PBXBuildFile; fileRef = EDBE8F3B25E7E79F001EB4A4 /* ColorRAMBank.h */; }; @@ -196,6 +196,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 8354900726186D9E004988A7 /* mos652x.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mos652x.cpp; sourceTree = ""; }; + 8354900826186D9E004988A7 /* mos652x.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mos652x.h; sourceTree = ""; }; EDBE8EF925E7E641001EB4A4 /* sidplayfp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = sidplayfp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EDBE8F1225E7E79F001EB4A4 /* sidrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sidrandom.h; path = sidplayfp/src/sidrandom.h; sourceTree = ""; }; EDBE8F1325E7E79F001EB4A4 /* reloc65.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = reloc65.cpp; path = sidplayfp/src/reloc65.cpp; sourceTree = ""; }; @@ -229,8 +231,6 @@ EDBE8F3325E7E79F001EB4A4 /* SerialPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerialPort.h; sourceTree = ""; }; EDBE8F3425E7E79F001EB4A4 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = ""; }; EDBE8F3525E7E79F001EB4A4 /* interrupt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interrupt.h; sourceTree = ""; }; - EDBE8F3625E7E79F001EB4A4 /* mos6526.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mos6526.h; sourceTree = ""; }; - EDBE8F3725E7E79F001EB4A4 /* mos6526.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mos6526.cpp; sourceTree = ""; }; EDBE8F3925E7E79F001EB4A4 /* ExtraSidBank.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraSidBank.h; sourceTree = ""; }; EDBE8F3A25E7E79F001EB4A4 /* SystemROMBanks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemROMBanks.h; sourceTree = ""; }; EDBE8F3B25E7E79F001EB4A4 /* ColorRAMBank.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorRAMBank.h; sourceTree = ""; }; @@ -568,16 +568,16 @@ EDBE8F2D25E7E79F001EB4A4 /* CIA */ = { isa = PBXGroup; children = ( - EDBE8F2E25E7E79F001EB4A4 /* tod.h */, - EDBE8F2F25E7E79F001EB4A4 /* tod.cpp */, - EDBE8F3025E7E79F001EB4A4 /* SerialPort.cpp */, EDBE8F3125E7E79F001EB4A4 /* interrupt.cpp */, - EDBE8F3225E7E79F001EB4A4 /* timer.cpp */, - EDBE8F3325E7E79F001EB4A4 /* SerialPort.h */, - EDBE8F3425E7E79F001EB4A4 /* timer.h */, EDBE8F3525E7E79F001EB4A4 /* interrupt.h */, - EDBE8F3625E7E79F001EB4A4 /* mos6526.h */, - EDBE8F3725E7E79F001EB4A4 /* mos6526.cpp */, + 8354900726186D9E004988A7 /* mos652x.cpp */, + 8354900826186D9E004988A7 /* mos652x.h */, + EDBE8F3025E7E79F001EB4A4 /* SerialPort.cpp */, + EDBE8F3325E7E79F001EB4A4 /* SerialPort.h */, + EDBE8F3225E7E79F001EB4A4 /* timer.cpp */, + EDBE8F3425E7E79F001EB4A4 /* timer.h */, + EDBE8F2F25E7E79F001EB4A4 /* tod.cpp */, + EDBE8F2E25E7E79F001EB4A4 /* tod.h */, ); path = CIA; sourceTree = ""; @@ -1005,6 +1005,7 @@ EDBE908825E7E7A2001EB4A4 /* SincResampler.h in Headers */, EDBE908225E7E7A2001EB4A4 /* Dac.h in Headers */, EDBE902C25E7E7A2001EB4A4 /* timer.h in Headers */, + 8354900A26186D9E004988A7 /* mos652x.h in Headers */, EDBE906F25E7E7A2001EB4A4 /* voice.h in Headers */, EDBE90A925E7E7A2001EB4A4 /* Filter6581.h in Headers */, EDBE90F025E7E7A2001EB4A4 /* SidTuneBase.h in Headers */, @@ -1104,7 +1105,6 @@ EDBE909325E7E7A2001EB4A4 /* EnvelopeGenerator.h in Headers */, EDBE90BD25E7E7A2001EB4A4 /* sidmemory.h in Headers */, EDBE90B625E7E7A2001EB4A4 /* player.h in Headers */, - EDBE902E25E7E7A2001EB4A4 /* mos6526.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1206,6 +1206,7 @@ EDBE905825E7E7A2001EB4A4 /* envelope.cc in Sources */, EDBE907A25E7E7A2001EB4A4 /* wave.cc in Sources */, EDBE90E025E7E7A2001EB4A4 /* SidTuneInfo.cpp in Sources */, + 8354900926186D9E004988A7 /* mos652x.cpp in Sources */, EDBE906225E7E7A2001EB4A4 /* sid.cc in Sources */, EDBE909B25E7E7A2001EB4A4 /* Integrator.cpp in Sources */, EDBE903D25E7E7A2001EB4A4 /* hardsid-emu-unix.cpp in Sources */, @@ -1216,7 +1217,6 @@ EDBE90E125E7E7A2001EB4A4 /* psiddrv.cpp in Sources */, EDBE90E625E7E7A2001EB4A4 /* SidTuneBase.cpp in Sources */, EDBE90AA25E7E7A2001EB4A4 /* Spline.cpp in Sources */, - EDBE902F25E7E7A2001EB4A4 /* mos6526.cpp in Sources */, EDBE900F25E7E7A2001EB4A4 /* reloc65.cpp in Sources */, EDBE902825E7E7A2001EB4A4 /* SerialPort.cpp in Sources */, EDBE909925E7E7A2001EB4A4 /* Filter6581.cpp in Sources */,