Skip to content

Commit

Permalink
Updated configure and Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Oct 17, 2017
1 parent a65a84a commit 8145eec
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
View file
Expand Up @@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@

DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL_mixer.h SDL2_mixer.spec SDL2_mixer.spec.in debian VisualC Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_modplug.c dynamic_modplug.h dynamic_mikmod.c dynamic_mikmod.h dynamic_smpeg.c dynamic_smpeg.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h external gcc-fat.sh load_aiff.c load_aiff.h load_flac.c load_flac.h load_mp3.c load_mp3.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c mixer.h music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_smpeg.c music_smpeg.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc

LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
Expand Down
38 changes: 19 additions & 19 deletions configure
View file
Expand Up @@ -11723,7 +11723,7 @@ done
fi
if test "x$enable_music_cmd" != xno; then
SOURCES="$SOURCES $srcdir/music_cmd.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DCMD_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
fi
fi

Expand All @@ -11736,7 +11736,7 @@ fi

if test x$enable_music_wave = xyes; then
SOURCES="$SOURCES $srcdir/wavestream.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DWAV_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
fi

# Check whether --enable-music-mod was given.
Expand Down Expand Up @@ -11945,7 +11945,7 @@ fi
;;
esac
SOURCES="$SOURCES $srcdir/*_modplug.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_MUSIC $MODPLUG_CFLAGS"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
echo "-- dynamic libmodplug -> $modplug_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_DYNAMIC=\\\"$modplug_lib\\\""
Expand Down Expand Up @@ -12023,7 +12023,7 @@ fi

CFLAGS_SAVED="$CFLAGS"
LIBS_SAVED="$LIBS"
CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`"
LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
have_libmikmod=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmikmod - version >= $libmikmod_ver" >&5
Expand Down Expand Up @@ -12076,8 +12076,8 @@ fi
fi
;;
esac
SOURCES="$SOURCES $srcdir/*_mod.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
SOURCES="$SOURCES $srcdir/*_mikmod.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
echo "-- dynamic libmikmod -> $mikmod_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_DYNAMIC=\\\"$mikmod_lib\\\""
Expand All @@ -12103,7 +12103,7 @@ else
fi

if test x$enable_music_midi = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMID_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID"
# Check whether --enable-music-midi-timidity was given.
if test "${enable_music_midi_timidity+set}" = set; then :
enableval=$enable_music_midi_timidity;
Expand All @@ -12112,7 +12112,7 @@ else
fi

if test x$enable_music_midi_timidity = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMIDITY_MIDI -I\$(srcdir)/timidity"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
SOURCES="$SOURCES $srcdir/timidity/*.c"
fi
# Check whether --enable-music-midi-native was given.
Expand Down Expand Up @@ -12142,10 +12142,10 @@ fi
;;
esac
if test x$use_music_midi_native = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
SOURCES="$SOURCES $srcdir/native_midi/*.c"
elif test x$use_music_midi_native = xyes_cpp; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
SOURCES="$SOURCES $srcdir/native_midi/*.c"
SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
fi
Expand Down Expand Up @@ -12228,7 +12228,7 @@ fi
;;
esac
SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLUIDSYNTH_DYNAMIC=\\\"$fluidsynth_lib\\\""
Expand Down Expand Up @@ -12338,7 +12338,7 @@ fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisidec -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
Expand Down Expand Up @@ -12416,7 +12416,7 @@ fi
;;
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
echo "-- dynamic libvorbisfile -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
Expand Down Expand Up @@ -12552,7 +12552,7 @@ fi
;;
esac
SOURCES="$SOURCES $srcdir/*_flac.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
echo "-- dynamic libFLAC -> $flac_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
Expand Down Expand Up @@ -12844,10 +12844,10 @@ rm -f core conftest.err conftest.$ac_objext \
smpeg_lib=`find_lib "libsmpeg2*.so.*"`
;;
esac
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
echo "-- dynamic libsmpeg -> $smpeg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_DYNAMIC=\\\"$smpeg_lib\\\""
EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
fi
Expand Down Expand Up @@ -12892,7 +12892,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$have_libmad" >&6; }
if test x$have_libmad = xyes; then
SOURCES="$SOURCES $srcdir/music_mad.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find MAD library (http://www.underbit.com/products/mad/)" >&5
Expand Down Expand Up @@ -12935,7 +12935,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$have_libmpg123" >&6; }
if test x$have_libmpg123 = xyes; then
SOURCES="$SOURCES $srcdir/music_mpg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MPG_MUSIC"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find mpg123 library (https://www.mpg123.de)" >&5
Expand All @@ -12944,7 +12944,7 @@ $as_echo "$as_me: WARNING: *** Unable to find mpg123 library (https://www.mpg123
fi

if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
SOURCES="$SOURCES $srcdir/*_mp3.c"
SOURCES="$SOURCES $srcdir/load_mp3.c"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5
$as_echo "$as_me: WARNING: MP3 support disabled" >&2;}
Expand Down

0 comments on commit 8145eec

Please sign in to comment.