deps: update mikmod to 3.3.12

ZDoom · Jan 3, 2025 · 5a4cd5f · 5a4cd5f
1 parent 507e5d5
commit 5a4cd5f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/deps/mikmod/bin/libmikmod-config b/deps/mikmod/bin/libmikmod-config
@@ -1,10 +1,10 @@
 #! /bin/sh
 
 prefix="$(cd "${0%/*}/.."; pwd)"
-exec_prefix=${prefix}
+exec_prefix="${prefix}"
 exec_prefix_set=no
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir="${exec_prefix}/lib"
+includedir="${prefix}/include"
 
 usage="\
 Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
@@ -38,7 +38,7 @@ while test $# -gt 0 ; do
 		echo $exec_prefix
 	;;
 	--version)
-		echo 3.3.11
+		echo 3.3.12
 	;;
 	--cflags)
 		if test $includedir != /usr/include ; then
@@ -50,7 +50,7 @@ while test $# -gt 0 ; do
 		echo 
 	;;
 	--libs)
-		echo -L${exec_prefix}/lib -lmikmod  -framework CoreAudio -lm 
+		echo -L${exec_prefix}/lib -lmikmod -framework AudioToolbox -framework AudioUnit -framework CoreServices
 	;;
 	*)
 		echo "${usage}" 1>&2

diff --git a/deps/mikmod/include/mikmod.h b/deps/mikmod/include/mikmod.h
@@ -39,7 +39,7 @@ extern "C" {
  *
  * ========== NOTE TO WINDOWS DEVELOPERS:
  * If you are compiling for Windows and will link to the static library
- * (libmikmod.a with MinGW, or mikmod_static.lib with MSVC or LCC, etc),
+ * (libmikmod.a with MinGW, or mikmod_static.lib with MSVC, Watcom, ..),
  * you must define MIKMOD_STATIC in your project.  Otherwise, dllimport
  * will be assumed.
  */
@@ -74,7 +74,7 @@ extern "C" {
 
 #define LIBMIKMOD_VERSION_MAJOR 3L
 #define LIBMIKMOD_VERSION_MINOR 3L
-#define LIBMIKMOD_REVISION     11L
+#define LIBMIKMOD_REVISION     12L
 
 #define LIBMIKMOD_VERSION \
     ((LIBMIKMOD_VERSION_MAJOR<<16)| \
@@ -87,7 +87,7 @@ MIKMODAPI extern long MikMod_GetVersion(void);
  *  ========== Dependency platform headers
  */
 
-#ifdef _WIN32
+#if defined(_WIN32)||defined(__CYGWIN__)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
@@ -134,10 +134,8 @@ typedef unsigned char      UBYTE;
 #endif
 
 /* 2 bytes, signed and unsigned: */
-#ifndef __LCC__
 typedef signed short int   SWORD;
-#endif
-#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA))
+#if !defined(_MIKMOD_AMIGA)
 typedef unsigned short int UWORD;
 #endif
 
@@ -252,14 +250,14 @@ enum {
     MMERR_MAC_SPEED,
     MMERR_MAC_START,
 
-    MMERR_OSX_UNKNOWN_DEVICE,
-    MMERR_OSX_BAD_PROPERTY,
+    MMERR_OSX_UNKNOWN_DEVICE, /* obsolete */
+    MMERR_OSX_BAD_PROPERTY,   /* obsolete */
     MMERR_OSX_UNSUPPORTED_FORMAT,
-    MMERR_OSX_SET_STEREO,
-    MMERR_OSX_BUFFER_ALLOC,
-    MMERR_OSX_ADD_IO_PROC,
+    MMERR_OSX_SET_STEREO,     /* obsolete */
+    MMERR_OSX_BUFFER_ALLOC,   /* obsolete */
+    MMERR_OSX_ADD_IO_PROC,    /* obsolete */
     MMERR_OSX_DEVICE_START,
-    MMERR_OSX_PTHREAD,
+    MMERR_OSX_PTHREAD,        /* obsolete */
 
     MMERR_DOSWSS_STARTDMA,
     MMERR_DOSSB_STARTDMA,
@@ -374,8 +372,9 @@ typedef struct MWRITER {
 #define SF_BIG_ENDIAN   0x0008
 #define SF_DELTA        0x0010
 #define SF_ITPACKED     0x0020
+#define SF_ADPCM4       0x0040
 
-#define SF_FORMATMASK   0x003F
+#define SF_FORMATMASK   0x007F
 
 /* General Playback flags */
 
@@ -549,6 +548,7 @@ struct MP_VOICE;
 #define UF_FT2QUIRKS    0x0200 /* emulate some FT2 replay quirks */
 #define UF_PANNING      0x0400 /* module uses panning effects or have
                                   non-tracker default initial panning */
+#define UF_FARTEMPO     0x0800 /* Module uses Farandole tempo calculations */
 
 typedef struct MODULE {
  /* general module information */
@@ -833,6 +833,7 @@ MIKMODAPI extern struct MDRIVER drv_osx;    /* MacOS X CoreAudio Driver */
 MIKMODAPI extern struct MDRIVER drv_dc;     /* Dreamcast driver */
 MIKMODAPI extern struct MDRIVER drv_gp32;   /* GP32 Sound driver */
 MIKMODAPI extern struct MDRIVER drv_psp;    /* PlayStation Portable driver */
+MIKMODAPI extern struct MDRIVER drv_n64;    /* Nintendo64 driver */
 
 MIKMODAPI extern struct MDRIVER drv_wss;    /* DOS WSS driver */
 MIKMODAPI extern struct MDRIVER drv_sb;     /* DOS S/B driver */

diff --git a/deps/mikmod/lib/libmikmod.a b/deps/mikmod/lib/libmikmod.a
diff --git a/deps/mikmod/lib/pkgconfig/libmikmod.pc b/deps/mikmod/lib/pkgconfig/libmikmod.pc
@@ -5,8 +5,8 @@ includedir=${prefix}/include
 
 Name: libmikmod
 Description: Library for playing Module Files and for Sound Effects
-Version: 3.3.11
+Version: 3.3.12
 URL: http://mikmod.sourceforge.net/
 Libs: -L${libdir} -lmikmod
-Libs.private: -lm
+Libs.private: -framework AudioToolbox -framework AudioUnit -framework CoreServices
 Cflags: -I${includedir}