summaryrefslogtreecommitdiff
path: root/audio/sdl_mixer/files/patch-aa
blob: 488b363b4c31a23bf4b548108362881e70b48673 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- Makefile.in.orig	Mon Jul  3 07:38:36 2000
+++ Makefile.in	Tue Aug 15 10:02:41 2000
@@ -90,15 +90,15 @@
 lib_LTLIBRARIES = libSDL_mixer.la
 
 SUBDIRS = @MUSIC_SUBDIRS@
-DIST_SUBIDRS = mikmod timidity
+DIST_SUBIDRS = timidity
 
-libSDL_mixerincludedir = $(includedir)/SDL
+libSDL_mixerincludedir = $(includedir)/SDL11
 libSDL_mixerinclude_HEADERS =  	SDL_mixer.h
 
 
 libSDL_mixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			music_ogg.c			music_ogg.h			wave.h				wavestream.c			wavestream.h
 
-@USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
+@USE_MIKMOD_TRUE@MIKMOD_LIB = -lmikmod
 @USE_MIKMOD_FALSE@MIKMOD_LIB = 
 @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
 @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
@@ -106,7 +106,7 @@
 EXTRA_DIST =  	CHANGES				VisualC.zip			MPWmake.sea.hqx			CWprojects.sea.hqx		autogen.sh
 
 
-libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libSDL_mixer_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
 
@@ -126,12 +126,11 @@
 LIBS = @LIBS@
 @USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = 
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
-@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES =  \
 @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
 @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
-@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
+
 libSDL_mixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo music_ogg.lo \
 wavestream.lo
 PROGRAMS =  $(bin_PROGRAMS)