View | Details | Raw Unified
Collapse All | Expand All

(-) SDL_mixer-1.2.5.orig/Makefile.am (-12 / +8 lines)
 Lines 1066-1072    Link Here  
			if ( ! Player_Active() ) {
			if ( ! Player_Active() ) {
				return(-1);
				return(-1);
			}
			}
			Player_SetSynchroValue(i);
 
//			Player_SetSynchroValue(i);
 
			return 0;
			return 0;
			break;
			break;
#endif
#endif
 Lines 1088-1094    Link Here  
			if ( ! Player_Active() ) {
			if ( ! Player_Active() ) {
				return(-1);
				return(-1);
			}
			}
			return Player_GetSynchroValue();
 
			return -1;
 

              
//			return Player_GetSynchroValue();

            

        
			break;
			break;

        
#endif
#endif

        
		    default:
		    default:

  

    

    

       Lines 1110-1117
       
    
  Link Here 
    

  

        
#endif
#endif

        
#ifdef MOD_MUSIC
#ifdef MOD_MUSIC

        
	MikMod_Exit();
	MikMod_Exit();

            

              
	MikMod_UnregisterAllLoaders();

              
//	MikMod_UnregisterAllLoaders();

            

            

              
	MikMod_UnregisterAllDrivers();

              
//	MikMod_UnregisterAllDrivers();

            

        
#endif
#endif

        
}
}

        

  

    

    

       Lines 108-114
       
    
  Link Here 
    

  

        
              , enable_music_mod=yes)
              , enable_music_mod=yes)

        
if test x$enable_music_mod = xyes; then
if test x$enable_music_mod = xyes; then

        
    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"

            

              
    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"

              
    SYSTEM_LIBS="$SYSTEM_LIBS -lmikmod"

            

        
fi
fi

        
AC_ARG_ENABLE(music-midi,
AC_ARG_ENABLE(music-midi,

        
[  --enable-music-midi     enable MIDI music via timidity [default=yes]],
[  --enable-music-midi     enable MIDI music via timidity [default=yes]],

  

    

    

       Lines 3-9
       
    
  Link Here 
    

  

        
lib_LTLIBRARIES = libSDL_mixer.la
lib_LTLIBRARIES = libSDL_mixer.la

        

        
SUBDIRS = @MUSIC_SUBDIRS@
SUBDIRS = @MUSIC_SUBDIRS@

            

              
DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl

              
DIST_SUBDIRS = timidity native_midi native_midi_gpl

            

        

        
libSDL_mixerincludedir = $(includedir)/SDL
libSDL_mixerincludedir = $(includedir)/SDL

        
libSDL_mixerinclude_HEADERS =	\
libSDL_mixerinclude_HEADERS =	\

  

    

    

       Lines 29-39
       
    
  Link Here 
    

  

        
	effects_internal.c	\
	effects_internal.c	\

        
	effects_internal.h
	effects_internal.h

        

            

              
if USE_MIKMOD

              
            

            

              
MIKMOD_LIB = mikmod/libmikmod.la

              
            

            

              
else

              
            

            

              
MIKMOD_LIB =

              
            

            

              
endif

              
            

        
if USE_TIMIDITY
if USE_TIMIDITY

        
TIMIDITY_LIB = timidity/libtimidity.la
TIMIDITY_LIB = timidity/libtimidity.la

        
else
else

  

    

    

       Lines 62-68
       
    
  Link Here 
    

  

        
libSDL_mixer_la_LDFLAGS = 		\
libSDL_mixer_la_LDFLAGS = 		\

        
	-release $(LT_RELEASE)	\
	-release $(LT_RELEASE)	\

        
	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

            

              
libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@

              
libSDL_mixer_la_LIBADD = $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@

            

        

        
noinst_PROGRAMS = playwave playmus
noinst_PROGRAMS = playwave playmus