*** empty log message ***

libsdl-org · Dec 27, 2004 · 483b4a1 · 483b4a1
1 parent b3860d6
commit 483b4a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,6 @@
 1.2.7:
+Sam Lantinga - Wed Dec 22 17:14:32 PST 2004
+ * Disabled support for the system version of libmikmod by default
 Sam Lantinga - Tue Dec 21 09:51:29 PST 2004
  * Fixed building mikmod support on UNIX
  * Always build SDL_RWops music support

diff --git a/configure.in b/configure.in
@@ -99,19 +99,18 @@ AC_ARG_ENABLE(music-wave,
 if test x$enable_music_wave = xyes; then
     CFLAGS="$CFLAGS -DWAV_MUSIC"
 fi
-no_libmikmod=no
+no_libmikmod=yes
 libmikmod_maj=3
 libmikmod_min=1
 libmikmod_rev=10
 libmikmod_ver="$libmikmod_maj.$libmikmod_min.$libmikmod_rev"
 AC_ARG_ENABLE(music-libmikmod,
-[  --enable-music-libmikmod  enable MOD music via externl libmikmod [default=yes]],
-              , enable_music_libmikmod=yes)
+[  --enable-music-libmikmod  enable MOD music via external libmikmod [default=no]],
+              , enable_music_libmikmod=no)
 if test x$enable_music_libmikmod = xyes; then
 	AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH])
-	if test "$LIBMIKMOD_CONFIG" = "no" ; then
-		no_libmikmod=yes
-	else
+	if test "$LIBMIKMOD_CONFIG" != "no" ; then
+		no_libmikmod=no
 		CFLAGS_SAVED="$CFLAGS"
 		LIBS_SAVED="$LIBS"
 		CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
@@ -132,7 +131,7 @@ int main(int argc, char **argv)
 	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
 	return 1;
 }
-],, no_libmikmod=yes;CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
+],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
 [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 	fi
 fi

diff --git a/playmus.c b/playmus.c
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 		/* Load the requested music file */
 		if ( rwops ) {
 			rwfp = SDL_RWFromFile(argv[i], "rb");
-			music = Mix_LoadMUS(argv[i]);
+			music = Mix_LoadMUS_RW(rwfp);
 		} else {
 			music = Mix_LoadMUS(argv[i]);
 		}