1 --- Makefile (révision 380)
2 +++ Makefile (copie de travail)
4 default: $(DEP) x264$(EXE)
6 libx264.a: .depend $(OBJS) $(OBJASM)
7 - ar rc libx264.a $(OBJS) $(OBJASM)
9 + $(AR) rc libx264.a $(OBJS) $(OBJASM)
12 x264$(EXE): libx264.a x264.o matroska.o
13 $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
16 rm -f config.mak vfw/build/cygwin/config.mak x264.pc
20 install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
21 install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
22 install -m 644 x264.h $(DESTDIR)$(includedir)
23 install -m 644 libx264.a $(DESTDIR)$(libdir)
24 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
25 - install x264 $(DESTDIR)$(bindir)
26 - ranlib $(DESTDIR)$(libdir)/libx264.a
27 + install x264$(EXE) $(DESTDIR)$(bindir)
28 + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
31 rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
32 --- configure (révision 385)
33 +++ configure (copie de travail)
35 echo "available options:"
37 echo " --help print this message"
38 +echo " --crosscompile=ARCH crosscompile for ARCH"
39 echo " --enable-avis-input enables avisynth input (win32 only)"
40 echo " --enable-mp4-output enables mp4 output (using gpac)"
41 echo " --enable-vfw compiles the VfW frontend"
51 +UNAMES="`uname -s |tr A-Z a-z`"
52 +UNAMEM="`uname -m |tr A-Z a-z`"
63 + RANLIB="$CROSS-ranlib"
64 + UNAMES="`echo $CROSS | cut -d- -f2`"
65 + UNAMEM="`echo $CROSS | cut -d- -f1`"
80 + includedir="$optarg"
82 + --enable-avis-input)
83 + if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
84 + CFLAGS="$CFLAGS -DAVIS_INPUT"
85 + LDFLAGS="$LDFLAGS -lvfw32"
89 + --enable-mp4-output)
90 + CFLAGS="$CFLAGS -DMP4_OUTPUT"
91 + LDFLAGS="$LDFLAGS -lgpac_static"
92 + if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
93 + LDFLAGS="$LDFLAGS -lwinmm"
98 + ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
101 + CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
102 + VFW_CFLAGS="${opt#--extra-cflags=}"
105 + LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
106 + VFW_LDFLAGS="${opt#--extra-ldflags=}"
109 + CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
115 + LDFLAGS="$LDFLAGS -lpthread"
120 + CFLAGS="$CFLAGS -g"
124 + CFLAGS="$CFLAGS -pg"
125 + LDFLAGS="$LDFLAGS -pg"
129 + CFLAGS="$CFLAGS -fPIC"
130 + ASFLAGS="$ASFLAGS -D__PIC__"
136 + --enable-visualize)
137 + LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
138 + CFLAGS="$CFLAGS -DVISUALIZE=1"
142 + echo "Unknown option $opt, ignored"
152 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
157 CFLAGS="$CFLAGS -falign-loops=16"
158 LDFLAGS="$LDFLAGS -lm -lmx"
163 LDFLAGS="$LDFLAGS -lm"
168 LDFLAGS="$LDFLAGS -lm"
173 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
174 LDFLAGS="$LDFLAGS -lm"
179 CFLAGS="$CFLAGS -mno-cygwin"
180 LDFLAGS="$LDFLAGS -mno-cygwin"
181 ASFLAGS="-f win32 -DPREFIX"
189 ASFLAGS="-f win32 -DPREFIX"
197 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
198 LDFLAGS="$LDFLAGS -lm"
205 - i386|i486|i586|i686|BePC)
206 + i386|i486|i586|i686|bepc)
208 CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
212 ASFLAGS="-f elf -m amd64"
214 - "Power Macintosh"|ppc)
215 + "power macintosh"|ppc)
229 @@ -180,134 +273,6 @@
231 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
242 - exec_prefix="$optarg"
251 - includedir="$optarg"
253 - --enable-avis-input)
256 - --disable-avis-input)
259 - --enable-mp4-output)
262 - --disable-mp4-output)
266 - ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
269 - CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
270 - VFW_CFLAGS="${opt#--extra-cflags=}"
273 - LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
274 - VFW_LDFLAGS="${opt#--extra-ldflags=}"
283 - CFLAGS="$CFLAGS -g"
287 - CFLAGS="$CFLAGS -pg"
288 - LDFLAGS="$LDFLAGS -pg"
292 - CFLAGS="$CFLAGS -fPIC"
293 - ASFLAGS="$ASFLAGS -D__PIC__"
302 - --enable-visualize)
303 - LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
304 - CFLAGS="$CFLAGS -DVISUALIZE=1"
308 - echo "Unknown option $opt, ignored"
313 -# autodetect options that weren't forced nor disabled
315 -if test "$pthread" = "auto" ; then
322 - cc_check pthread.h -lpthread && pthread="yes"
326 -if test "$pthread" = "yes" ; then
327 - CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
331 - *) LDFLAGS="$LDFLAGS -lpthread"
336 -MP4_LDFLAGS="-lgpac_static"
337 -if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
338 - MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
340 -if [ "$mp4_output" = "auto" ] ; then
342 - cc_check gpac/isomedia.h "$MP4_LDFLAGS" && mp4_output="yes"
344 -if [ "$mp4_output" = "yes" ] ; then
345 - echo "#define MP4_OUTPUT" >> config.h
346 - LDFLAGS="$LDFLAGS $MP4_LDFLAGS"
349 -if [ "$avis_input" = "auto" ] ; then
350 - if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
356 -if [ "$avis_input" = "yes" ] ; then
357 - echo "#define AVIS_INPUT" >> config.h
358 - LDFLAGS="$LDFLAGS -lvfw32"
361 if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
362 CFLAGS="$CFLAGS -s -fomit-frame-pointer"
363 LDFLAGS="$LDFLAGS -s"
372 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG