Skip to content

Commit c02f808

Browse files
committed
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)
1 parent e63201b commit c02f808

File tree

26 files changed

+1039
-117
lines changed

26 files changed

+1039
-117
lines changed
-364 KB
Binary file not shown.
-231 KB
Binary file not shown.
Binary file not shown.

external/libmodplug-0.8.9.0/configure

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16702,13 +16702,12 @@ fi
1670216702

1670316703
done
1670416704

16705-
for ac_func in setenv sinf
16705+
for ac_func in sinf
1670616706
do :
16707-
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
16708-
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
16709-
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
16707+
ac_fn_cxx_check_func "$LINENO" "sinf" "ac_cv_func_sinf"
16708+
if test "x$ac_cv_func_sinf" = xyes; then :
1671016709
cat >>confdefs.h <<_ACEOF
16711-
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
16710+
#define HAVE_SINF 1
1671216711
_ACEOF
1671316712

1671416713
fi

external/libmodplug-0.8.9.0/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LT_INIT([win32-dll])
2929

3030
AC_HEADER_STDC
3131
AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
32-
AC_CHECK_FUNCS(setenv sinf)
32+
AC_CHECK_FUNCS(sinf)
3333

3434
CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -fno-common -D_REENTRANT"
3535

@@ -99,6 +99,6 @@ MODPLUG_LIBRARY_VERSION=1:0:0
9999
AC_SUBST(MODPLUG_LIBRARY_VERSION)
100100

101101
AC_CONFIG_FILES([Makefile
102-
src/Makefile
102+
src/Makefile
103103
libmodplug.pc])
104104
AC_OUTPUT

0 commit comments

Comments
 (0)