configure.in
changeset 777 92882ef2ab81
parent 757 420f3b37dc95
child 780 74df2aa47195
     1.1 --- a/configure.in	Mon Oct 16 02:16:47 2017 -0700
     1.2 +++ b/configure.in	Tue Oct 17 02:33:47 2017 -0700
     1.3 @@ -230,7 +230,7 @@
     1.4      fi
     1.5      if test "x$enable_music_cmd" != xno; then
     1.6          SOURCES="$SOURCES $srcdir/music_cmd.c"
     1.7 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DCMD_MUSIC"
     1.8 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
     1.9      fi
    1.10  fi
    1.11  
    1.12 @@ -239,7 +239,7 @@
    1.13                [], [enable_music_wave=yes])
    1.14  if test x$enable_music_wave = xyes; then
    1.15      SOURCES="$SOURCES $srcdir/wavestream.c"
    1.16 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DWAV_MUSIC"
    1.17 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
    1.18  fi
    1.19  
    1.20  AC_ARG_ENABLE([music-mod],
    1.21 @@ -278,7 +278,7 @@
    1.22                  ;;
    1.23          esac
    1.24          SOURCES="$SOURCES $srcdir/*_modplug.c"
    1.25 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_MUSIC $MODPLUG_CFLAGS"
    1.26 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
    1.27          if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
    1.28              echo "-- dynamic libmodplug -> $modplug_lib"
    1.29              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_DYNAMIC=\\\"$modplug_lib\\\""
    1.30 @@ -307,7 +307,7 @@
    1.31          
    1.32          CFLAGS_SAVED="$CFLAGS"
    1.33          LIBS_SAVED="$LIBS"
    1.34 -        CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
    1.35 +        CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`"
    1.36          LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
    1.37          have_libmikmod=yes
    1.38          AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver])
    1.39 @@ -345,8 +345,8 @@
    1.40                  fi
    1.41                  ;;
    1.42          esac
    1.43 -        SOURCES="$SOURCES $srcdir/*_mod.c"
    1.44 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
    1.45 +        SOURCES="$SOURCES $srcdir/*_mikmod.c"
    1.46 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
    1.47          if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
    1.48              echo "-- dynamic libmikmod -> $mikmod_lib"
    1.49              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_DYNAMIC=\\\"$mikmod_lib\\\""
    1.50 @@ -366,12 +366,12 @@
    1.51  AC_HELP_STRING([--enable-music-midi], [enable MIDI music [[default=yes]]]),
    1.52                [], [enable_music_midi=yes])
    1.53  if test x$enable_music_midi = xyes; then
    1.54 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMID_MUSIC"
    1.55 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID"
    1.56      AC_ARG_ENABLE([music-midi-timidity],
    1.57  AC_HELP_STRING([--enable-music-midi-timidity], [enable timidity MIDI output [[default=yes]]]),
    1.58                    [], [enable_music_midi_timidity=yes])
    1.59      if test x$enable_music_midi_timidity = xyes; then
    1.60 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMIDITY_MIDI -I\$(srcdir)/timidity"
    1.61 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
    1.62          SOURCES="$SOURCES $srcdir/timidity/*.c"
    1.63      fi
    1.64      AC_ARG_ENABLE([music-midi-native],
    1.65 @@ -397,10 +397,10 @@
    1.66                  ;;
    1.67          esac
    1.68          if test x$use_music_midi_native = xyes; then
    1.69 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
    1.70 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
    1.71              SOURCES="$SOURCES $srcdir/native_midi/*.c"
    1.72          elif test x$use_music_midi_native = xyes_cpp; then
    1.73 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
    1.74 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
    1.75              SOURCES="$SOURCES $srcdir/native_midi/*.c"
    1.76              SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
    1.77          fi
    1.78 @@ -431,7 +431,7 @@
    1.79                      ;;
    1.80              esac
    1.81              SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
    1.82 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
    1.83 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
    1.84              if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
    1.85                  echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
    1.86                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLUIDSYNTH_DYNAMIC=\\\"$fluidsynth_lib\\\""
    1.87 @@ -480,7 +480,7 @@
    1.88                      ;;
    1.89              esac
    1.90              SOURCES="$SOURCES $srcdir/*_ogg.c"
    1.91 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
    1.92 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
    1.93              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
    1.94                  echo "-- dynamic libvorbisidec -> $ogg_lib"
    1.95                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
    1.96 @@ -510,7 +510,7 @@
    1.97                      ;;
    1.98              esac
    1.99              SOURCES="$SOURCES $srcdir/*_ogg.c"
   1.100 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
   1.101 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
   1.102              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
   1.103                  echo "-- dynamic libvorbisfile -> $ogg_lib"
   1.104                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
   1.105 @@ -570,7 +570,7 @@
   1.106                      ;;
   1.107              esac
   1.108              SOURCES="$SOURCES $srcdir/*_flac.c"
   1.109 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
   1.110 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
   1.111              if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
   1.112                  echo "-- dynamic libFLAC -> $flac_lib"
   1.113                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
   1.114 @@ -609,10 +609,10 @@
   1.115                  smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
   1.116                  ;;
   1.117          esac
   1.118 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
   1.119 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
   1.120          if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
   1.121              echo "-- dynamic libsmpeg -> $smpeg_lib"
   1.122 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_DYNAMIC=\\\"$smpeg_lib\\\""
   1.123 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
   1.124          else
   1.125              EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
   1.126          fi
   1.127 @@ -636,7 +636,7 @@
   1.128      AC_MSG_RESULT($have_libmad)
   1.129      if test x$have_libmad = xyes; then
   1.130          SOURCES="$SOURCES $srcdir/music_mad.c"
   1.131 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
   1.132 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
   1.133          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
   1.134      else
   1.135          AC_MSG_WARN([*** Unable to find MAD library (http://www.underbit.com/products/mad/)])
   1.136 @@ -658,7 +658,7 @@
   1.137      AC_MSG_RESULT($have_libmpg123)
   1.138      if test x$have_libmpg123 = xyes; then
   1.139          SOURCES="$SOURCES $srcdir/music_mpg.c"
   1.140 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MPG_MUSIC"
   1.141 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
   1.142          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
   1.143      else
   1.144          AC_MSG_WARN([*** Unable to find mpg123 library (https://www.mpg123.de)])
   1.145 @@ -666,7 +666,7 @@
   1.146  fi
   1.147  
   1.148  if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
   1.149 -	SOURCES="$SOURCES $srcdir/*_mp3.c"
   1.150 +    SOURCES="$SOURCES $srcdir/load_mp3.c"
   1.151  else
   1.152      AC_MSG_WARN([MP3 support disabled])
   1.153  fi