*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Mon, 27 Dec 2004 06:52:47 +0000
changeset 2578a32c0a3c609
parent 256 6d7e102500c9
child 258 b468789fb49c
*** empty log message ***
CHANGES
configure.in
playmus.c
     1.1 --- a/CHANGES	Tue Dec 21 20:08:57 2004 +0000
     1.2 +++ b/CHANGES	Mon Dec 27 06:52:47 2004 +0000
     1.3 @@ -1,4 +1,6 @@
     1.4  1.2.7:
     1.5 +Sam Lantinga - Wed Dec 22 17:14:32 PST 2004
     1.6 + * Disabled support for the system version of libmikmod by default
     1.7  Sam Lantinga - Tue Dec 21 09:51:29 PST 2004
     1.8   * Fixed building mikmod support on UNIX
     1.9   * Always build SDL_RWops music support
     2.1 --- a/configure.in	Tue Dec 21 20:08:57 2004 +0000
     2.2 +++ b/configure.in	Mon Dec 27 06:52:47 2004 +0000
     2.3 @@ -99,19 +99,18 @@
     2.4  if test x$enable_music_wave = xyes; then
     2.5      CFLAGS="$CFLAGS -DWAV_MUSIC"
     2.6  fi
     2.7 -no_libmikmod=no
     2.8 +no_libmikmod=yes
     2.9  libmikmod_maj=3
    2.10  libmikmod_min=1
    2.11  libmikmod_rev=10
    2.12  libmikmod_ver="$libmikmod_maj.$libmikmod_min.$libmikmod_rev"
    2.13  AC_ARG_ENABLE(music-libmikmod,
    2.14 -[  --enable-music-libmikmod  enable MOD music via externl libmikmod [default=yes]],
    2.15 -              , enable_music_libmikmod=yes)
    2.16 +[  --enable-music-libmikmod  enable MOD music via external libmikmod [default=no]],
    2.17 +              , enable_music_libmikmod=no)
    2.18  if test x$enable_music_libmikmod = xyes; then
    2.19  	AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH])
    2.20 -	if test "$LIBMIKMOD_CONFIG" = "no" ; then
    2.21 -		no_libmikmod=yes
    2.22 -	else
    2.23 +	if test "$LIBMIKMOD_CONFIG" != "no" ; then
    2.24 +		no_libmikmod=no
    2.25  		CFLAGS_SAVED="$CFLAGS"
    2.26  		LIBS_SAVED="$LIBS"
    2.27  		CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
    2.28 @@ -132,7 +131,7 @@
    2.29  	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
    2.30  	return 1;
    2.31  }
    2.32 -],, no_libmikmod=yes;CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
    2.33 +],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
    2.34  [echo $ac_n "cross compiling; assumed OK... $ac_c"])
    2.35  	fi
    2.36  fi
     3.1 --- a/playmus.c	Tue Dec 21 20:08:57 2004 +0000
     3.2 +++ b/playmus.c	Mon Dec 27 06:52:47 2004 +0000
     3.3 @@ -187,7 +187,7 @@
     3.4  		/* Load the requested music file */
     3.5  		if ( rwops ) {
     3.6  			rwfp = SDL_RWFromFile(argv[i], "rb");
     3.7 -			music = Mix_LoadMUS(argv[i]);
     3.8 +			music = Mix_LoadMUS_RW(rwfp);
     3.9  		} else {
    3.10  			music = Mix_LoadMUS(argv[i]);
    3.11  		}