]>
Commit | Line | Data |
---|---|---|
6f9608c5 | 1 | diff -urN avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am avifile0.6-20011220/plugins/libac3pass/Makefile.am |
2 | --- avifile0.6-20011220.orig/plugins/libac3pass/Makefile.am Fri Jan 4 11:40:17 2002 | |
3 | +++ avifile0.6-20011220/plugins/libac3pass/Makefile.am Sun Jan 20 17:00:57 2002 | |
4 | @@ -2,6 +2,7 @@ | |
5 | noinst_HEADERS = ac3-iec958.h fillplugins.h | |
d3c2c24a JB |
6 | |
7 | libac3pass_la_SOURCES = ac3-iec958.c libac3pass.cpp | |
d3c2c24a | 8 | +libac3pass_la_LIBADD = ../../lib/libaviplay.la -lstdc++ |
6f9608c5 | 9 | libac3pass_la_LDFLAGS = -module -avoid-version |
10 | #-release $(LT_RELEASE) | |
d3c2c24a | 11 | |
6f9608c5 | 12 | diff -urN avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am avifile0.6-20011220/plugins/libaudiodec/Makefile.am |
13 | --- avifile0.6-20011220.orig/plugins/libaudiodec/Makefile.am Fri Jan 4 11:40:15 2002 | |
14 | +++ avifile0.6-20011220/plugins/libaudiodec/Makefile.am Sun Jan 20 17:07:16 2002 | |
d3c2c24a JB |
15 | @@ -3,7 +3,7 @@ |
16 | gsm61dec.cpp pcm.cpp aulaw.cpp xa_gsm.c | |
17 | noinst_HEADERS = ac3.h adpcm.h adpcm_impl.h gsm61dec.h pcm.h xa_gsm.h \ | |
18 | xa_gsm_state.h aulaw.h fillplugins.h | |
6f9608c5 | 19 | -libaudiodec_la_LIBADD = $(AC3_LIBADD) |
20 | +libaudiodec_la_LIBADD = $(AC3_LIBADD) ../../lib/libaviplay.la -lstdc++ | |
21 | libaudiodec_la_LDFLAGS = $(AC3_LIBS) $(AC3_LDADD) -module -avoid-version | |
22 | #-release $(LT_RELEASE) | |
d3c2c24a | 23 | |
6f9608c5 | 24 | diff -urN avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am avifile0.6-20011220/plugins/libdivx4/Makefile.am |
25 | --- avifile0.6-20011220.orig/plugins/libdivx4/Makefile.am Fri Jan 4 11:40:16 2002 | |
26 | +++ avifile0.6-20011220/plugins/libdivx4/Makefile.am Sun Jan 20 17:08:20 2002 | |
27 | @@ -3,7 +3,7 @@ | |
28 | DIVX4LIBS = -L/usr/local/lib -ldivxdecore -ldivxencore | |
29 | ||
30 | libdivx4_la_SOURCES = divx4.cpp | |
31 | -libdivx4_la_LIBADD = $(DIVX4LIBS) | |
32 | +libdivx4_la_LIBADD = $(DIVX4LIBS) ../../lib/libaviplay.la -lstdc++ | |
33 | libdivx4_la_LDFLAGS = -module -avoid-version | |
34 | AM_CXXFLAGS = -DLINUX | |
35 | noinst_HEADERS = fillplugins.h | |
36 | diff -urN avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am avifile0.6-20011220/plugins/libffmpeg/Makefile.am | |
37 | --- avifile0.6-20011220.orig/plugins/libffmpeg/Makefile.am Fri Jan 4 11:40:16 2002 | |
38 | +++ avifile0.6-20011220/plugins/libffmpeg/Makefile.am Sun Jan 20 17:09:09 2002 | |
39 | @@ -4,7 +4,7 @@ | |
d3c2c24a JB |
40 | noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h fillplugins.h bswap.h |
41 | libffmpeg_la_SOURCES = libffmpeg.cpp FFAudioDecoder.cpp FFVideoDecoder.cpp | |
6f9608c5 | 42 | #\ FFVideoEncoder.cpp |
d3c2c24a JB |
43 | -libffmpeg_la_LIBADD = libavcodec/libavcodec.la |
44 | +libffmpeg_la_LIBADD = libavcodec/libavcodec.la ../../lib/libaviplay.la -lstdc++ | |
6f9608c5 | 45 | libffmpeg_la_LDFLAGS = -module -avoid-version |
46 | #-release $(LT_RELEASE) | |
d3c2c24a | 47 | |
6f9608c5 | 48 | diff -urN avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am |
49 | --- avifile0.6-20011220.orig/plugins/libmp3lame_audioenc/Makefile.am Fri Jan 4 11:40:17 2002 | |
50 | +++ avifile0.6-20011220/plugins/libmp3lame_audioenc/Makefile.am Sun Jan 20 17:10:38 2002 | |
51 | @@ -2,7 +2,7 @@ | |
d3c2c24a JB |
52 | pkglib_LTLIBRARIES = libmp3lame_audioenc.la |
53 | noinst_HEADERS = mp3encoder.h fillplugins.h | |
54 | libmp3lame_audioenc_la_SOURCES = audioencoder.cpp mp3encoder.cpp | |
55 | -libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la | |
56 | +libmp3lame_audioenc_la_LIBADD = lame3.70/libmp3lame.la ../../lib/libaviplay.la -lstdc++ | |
6f9608c5 | 57 | libmp3lame_audioenc_la_LDFLAGS = -module -avoid-version |
58 | #-release $(LT_RELEASE) | |
59 | MAINTAINERCLEANFILES = Makefile.in | |
60 | diff -urN avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am | |
61 | --- avifile0.6-20011220.orig/plugins/libmp3lamebin_audioenc/Makefile.am Fri Jan 4 11:40:17 2002 | |
62 | +++ avifile0.6-20011220/plugins/libmp3lamebin_audioenc/Makefile.am Sun Jan 20 17:11:17 2002 | |
63 | @@ -4,6 +4,7 @@ | |
64 | libmp3lamebin_audioenc_la_LDFLAGS = -module -avoid-version | |
65 | MAINTAINERCLEANFILES = Makefile.in | |
66 | ||
d3c2c24a JB |
67 | +libmp3lamebin_audioenc_la_LIBADD = ../../lib/libaviplay.la -lstdc++ |
68 | # | |
6f9608c5 | 69 | # only lame.h header from the whole LAME project is here |
d3c2c24a | 70 | # |
6f9608c5 | 71 | diff -urN avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am |
72 | --- avifile0.6-20011220.orig/plugins/libmpeg_audiodec/Makefile.am Fri Jan 4 11:40:16 2002 | |
73 | +++ avifile0.6-20011220/plugins/libmpeg_audiodec/Makefile.am Sun Jan 20 17:12:59 2002 | |
74 | @@ -3,12 +3,12 @@ | |
d3c2c24a JB |
75 | huffmantable.cpp mpeglayer1.cpp mpeglayer2.cpp mpeglayer3.cpp \ |
76 | mpegtable.cpp mpegtoraw.cpp | |
6f9608c5 | 77 | libmpeg_audiodec_la_LDFLAGS = -module -avoid-version |
d3c2c24a | 78 | +libmpeg_audiodec_la_LIBADD = ../../lib/libaviplay.la -lstdc++ |
6f9608c5 | 79 | #-release $(LT_RELEASE) |
d3c2c24a | 80 | noinst_HEADERS = mpegsound.h mpegsound_locals.h fillplugins.h |
906111ee | 81 | |
4164aee2 | 82 | # currently it has to be compiled with optimalizations (inline has to work) |
d3c2c24a JB |
83 | -OPTFLG = -O2 -ffast-math -fomit-frame-pointer -funroll-loops |
84 | #-D__NO_STRING_INLINES -DDEBUG | |
85 | # -finline-functions | |
6f9608c5 | 86 | -AM_CXXFLAGS = $(OPTFLG) |
87 | +AM_CXXFLAGS = @CXXFLAGS@ | |
88 | MAINTAINERCLEANFILES = Makefile.in | |
89 | diff -urN avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am avifile0.6-20011220/plugins/libvorbis/Makefile.am | |
90 | --- avifile0.6-20011220.orig/plugins/libvorbis/Makefile.am Fri Jan 4 11:40:17 2002 | |
91 | +++ avifile0.6-20011220/plugins/libvorbis/Makefile.am Sun Jan 20 17:13:34 2002 | |
92 | @@ -1,6 +1,6 @@ | |
93 | pkglib_LTLIBRARIES = libvorbis_audio.la | |
94 | noinst_HEADERS = fillplugins.h | |
d3c2c24a | 95 | libvorbis_audio_la_SOURCES = libvorbis.cpp |
d3c2c24a JB |
96 | -libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis |
97 | +libvorbis_audio_la_LIBADD = -lvorbisfile -lvorbis ../../lib/libaviplay.la -lstdc++ | |
6f9608c5 | 98 | libvorbis_audio_la_LDFLAGS = -module -avoid-version |
99 | MAINTAINERCLEANFILES = Makefile.in | |
100 | diff -urN avifile0.6-20011220.orig/plugins/libwin32/Makefile.am avifile0.6-20011220/plugins/libwin32/Makefile.am | |
101 | --- avifile0.6-20011220.orig/plugins/libwin32/Makefile.am Fri Jan 4 11:40:16 2002 | |
102 | +++ avifile0.6-20011220/plugins/libwin32/Makefile.am Sun Jan 20 17:14:10 2002 | |
103 | @@ -7,7 +7,7 @@ | |
104 | libwin32_la_LIBADD = \ | |
d3c2c24a JB |
105 | audiodec/libaudiodec.la \ |
106 | loader/libloader.la \ | |
107 | - videocodec/libvideocodec.la | |
108 | + videocodec/libvideocodec.la ../../lib/libaviplay.la -lstdc++ | |
6edcacbe | 109 | |
6f9608c5 | 110 | libwin32_la_LDFLAGS = -module -avoid-version |
6edcacbe | 111 |