Updated configure and Makefile
authorSam Lantinga <slouken@libsdl.org>
Tue, 17 Oct 2017 02:39:45 -0700
changeset 77805c93f7af403
parent 777 92882ef2ab81
child 779 a2b494c054d5
Updated configure and Makefile
Makefile.in
configure
     1.1 --- a/Makefile.in	Tue Oct 17 02:33:47 2017 -0700
     1.2 +++ b/Makefile.in	Tue Oct 17 02:39:45 2017 -0700
     1.3 @@ -39,7 +39,7 @@
     1.4  PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
     1.5  PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
     1.6  
     1.7 -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
     1.8 +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
     1.9  
    1.10  LT_AGE      = @LT_AGE@
    1.11  LT_CURRENT  = @LT_CURRENT@
     2.1 --- a/configure	Tue Oct 17 02:33:47 2017 -0700
     2.2 +++ b/configure	Tue Oct 17 02:39:45 2017 -0700
     2.3 @@ -11723,7 +11723,7 @@
     2.4      fi
     2.5      if test "x$enable_music_cmd" != xno; then
     2.6          SOURCES="$SOURCES $srcdir/music_cmd.c"
     2.7 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DCMD_MUSIC"
     2.8 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
     2.9      fi
    2.10  fi
    2.11  
    2.12 @@ -11736,7 +11736,7 @@
    2.13  
    2.14  if test x$enable_music_wave = xyes; then
    2.15      SOURCES="$SOURCES $srcdir/wavestream.c"
    2.16 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DWAV_MUSIC"
    2.17 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
    2.18  fi
    2.19  
    2.20  # Check whether --enable-music-mod was given.
    2.21 @@ -11945,7 +11945,7 @@
    2.22                  ;;
    2.23          esac
    2.24          SOURCES="$SOURCES $srcdir/*_modplug.c"
    2.25 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_MUSIC $MODPLUG_CFLAGS"
    2.26 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
    2.27          if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
    2.28              echo "-- dynamic libmodplug -> $modplug_lib"
    2.29              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_DYNAMIC=\\\"$modplug_lib\\\""
    2.30 @@ -12023,7 +12023,7 @@
    2.31  
    2.32          CFLAGS_SAVED="$CFLAGS"
    2.33          LIBS_SAVED="$LIBS"
    2.34 -        CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
    2.35 +        CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`"
    2.36          LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
    2.37          have_libmikmod=yes
    2.38          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmikmod - version >= $libmikmod_ver" >&5
    2.39 @@ -12076,8 +12076,8 @@
    2.40                  fi
    2.41                  ;;
    2.42          esac
    2.43 -        SOURCES="$SOURCES $srcdir/*_mod.c"
    2.44 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
    2.45 +        SOURCES="$SOURCES $srcdir/*_mikmod.c"
    2.46 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
    2.47          if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
    2.48              echo "-- dynamic libmikmod -> $mikmod_lib"
    2.49              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_DYNAMIC=\\\"$mikmod_lib\\\""
    2.50 @@ -12103,7 +12103,7 @@
    2.51  fi
    2.52  
    2.53  if test x$enable_music_midi = xyes; then
    2.54 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMID_MUSIC"
    2.55 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID"
    2.56      # Check whether --enable-music-midi-timidity was given.
    2.57  if test "${enable_music_midi_timidity+set}" = set; then :
    2.58    enableval=$enable_music_midi_timidity;
    2.59 @@ -12112,7 +12112,7 @@
    2.60  fi
    2.61  
    2.62      if test x$enable_music_midi_timidity = xyes; then
    2.63 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMIDITY_MIDI -I\$(srcdir)/timidity"
    2.64 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
    2.65          SOURCES="$SOURCES $srcdir/timidity/*.c"
    2.66      fi
    2.67      # Check whether --enable-music-midi-native was given.
    2.68 @@ -12142,10 +12142,10 @@
    2.69                  ;;
    2.70          esac
    2.71          if test x$use_music_midi_native = xyes; then
    2.72 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
    2.73 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
    2.74              SOURCES="$SOURCES $srcdir/native_midi/*.c"
    2.75          elif test x$use_music_midi_native = xyes_cpp; then
    2.76 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
    2.77 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
    2.78              SOURCES="$SOURCES $srcdir/native_midi/*.c"
    2.79              SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
    2.80          fi
    2.81 @@ -12228,7 +12228,7 @@
    2.82                      ;;
    2.83              esac
    2.84              SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
    2.85 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
    2.86 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
    2.87              if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
    2.88                  echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
    2.89                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLUIDSYNTH_DYNAMIC=\\\"$fluidsynth_lib\\\""
    2.90 @@ -12338,7 +12338,7 @@
    2.91                      ;;
    2.92              esac
    2.93              SOURCES="$SOURCES $srcdir/*_ogg.c"
    2.94 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
    2.95 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
    2.96              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
    2.97                  echo "-- dynamic libvorbisidec -> $ogg_lib"
    2.98                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
    2.99 @@ -12416,7 +12416,7 @@
   2.100                      ;;
   2.101              esac
   2.102              SOURCES="$SOURCES $srcdir/*_ogg.c"
   2.103 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
   2.104 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
   2.105              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
   2.106                  echo "-- dynamic libvorbisfile -> $ogg_lib"
   2.107                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
   2.108 @@ -12552,7 +12552,7 @@
   2.109                      ;;
   2.110              esac
   2.111              SOURCES="$SOURCES $srcdir/*_flac.c"
   2.112 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
   2.113 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
   2.114              if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
   2.115                  echo "-- dynamic libFLAC -> $flac_lib"
   2.116                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
   2.117 @@ -12844,10 +12844,10 @@
   2.118                  smpeg_lib=`find_lib "libsmpeg2*.so.*"`
   2.119                  ;;
   2.120          esac
   2.121 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
   2.122 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
   2.123          if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
   2.124              echo "-- dynamic libsmpeg -> $smpeg_lib"
   2.125 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_DYNAMIC=\\\"$smpeg_lib\\\""
   2.126 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
   2.127          else
   2.128              EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
   2.129          fi
   2.130 @@ -12892,7 +12892,7 @@
   2.131  $as_echo "$have_libmad" >&6; }
   2.132      if test x$have_libmad = xyes; then
   2.133          SOURCES="$SOURCES $srcdir/music_mad.c"
   2.134 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
   2.135 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
   2.136          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
   2.137      else
   2.138          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find MAD library (http://www.underbit.com/products/mad/)" >&5
   2.139 @@ -12935,7 +12935,7 @@
   2.140  $as_echo "$have_libmpg123" >&6; }
   2.141      if test x$have_libmpg123 = xyes; then
   2.142          SOURCES="$SOURCES $srcdir/music_mpg.c"
   2.143 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MPG_MUSIC"
   2.144 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
   2.145          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
   2.146      else
   2.147          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find mpg123 library (https://www.mpg123.de)" >&5
   2.148 @@ -12944,7 +12944,7 @@
   2.149  fi
   2.150  
   2.151  if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
   2.152 -	SOURCES="$SOURCES $srcdir/*_mp3.c"
   2.153 +    SOURCES="$SOURCES $srcdir/load_mp3.c"
   2.154  else
   2.155      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5
   2.156  $as_echo "$as_me: WARNING: MP3 support disabled" >&2;}