update / reconfigure libmodplug and rebuild it:

- disable wav formats handling: SDL_mixer has its own code for it. - disable midi formats handling: SDL_mixer has timidity or native midi for it. - disable experimental (possibly broken) file save support: not used, ever. - don't export cplusplus interface from shared libs. SDL_mixer doesn't use it. - disable mmcmp unpacking. disable broken pp20 unpacking. - merge Konstanty/libmodplug#36 (fix PSM loader overwrites const data) - merge Konstanty/libmodplug#39 (case-sensitive STM signature checks) - merge Konstanty/libmodplug#40 (big-endian-friendly MDL track length read) - merge Konstanty/libmodplug#24 (make some stuff static) - merge Konstanty/libmodplug#14 (NO_PACKING and MODPLUG_NO_FILESAVE ifdefs) - merge Konstanty/libmodplug#32 (replace setenv) - merge Konstanty/libmodplug#41 (timidity paths update)
libsdl-org · Oct 23, 2018 · 38a1b48 · 38a1b48
1 parent 78824ea
commit 38a1b48
Show file tree

Hide file tree

Showing 26 changed files with 1,039 additions and 117 deletions.
diff --git a/VisualC/external/lib/x64/libmodplug-1.dll b/VisualC/external/lib/x64/libmodplug-1.dll
diff --git a/VisualC/external/lib/x86/libmodplug-1.dll b/VisualC/external/lib/x86/libmodplug-1.dll
diff --git a/Xcode/Frameworks/modplug.framework/Versions/A/modplug b/Xcode/Frameworks/modplug.framework/Versions/A/modplug
diff --git a/external/libmodplug-0.8.9.0/configure b/external/libmodplug-0.8.9.0/configure
@@ -16702,13 +16702,12 @@ fi
 
 done
 
-for ac_func in setenv sinf
+for ac_func in sinf
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_cxx_check_func "$LINENO" "sinf" "ac_cv_func_sinf"
+if test "x$ac_cv_func_sinf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SINF 1
 _ACEOF
 
 fi

diff --git a/external/libmodplug-0.8.9.0/configure.ac b/external/libmodplug-0.8.9.0/configure.ac
@@ -29,7 +29,7 @@ LT_INIT([win32-dll])
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
-AC_CHECK_FUNCS(setenv sinf)
+AC_CHECK_FUNCS(sinf)
 
 CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -fno-common -D_REENTRANT"
 
@@ -99,6 +99,6 @@ MODPLUG_LIBRARY_VERSION=1:0:0
 AC_SUBST(MODPLUG_LIBRARY_VERSION)
 
 AC_CONFIG_FILES([Makefile
-          src/Makefile
+	  src/Makefile
 	  libmodplug.pc])
 AC_OUTPUT