Commit 70e52acc authored by Christophe Mutricy's avatar Christophe Mutricy

Fix x264 compilation

parent 9c7c99b0
...@@ -500,9 +500,9 @@ Index: common/i386/mc-a2.asm ...@@ -500,9 +500,9 @@ Index: common/i386/mc-a2.asm
VIS=$vis VIS=$vis
HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
DEVNULL=$DEVNULL DEVNULL=$DEVNULL
--- Makefile.old 2005-11-23 17:25:15.953125000 +0000 --- Makefile (révision 380)
+++ Makefile 2005-11-23 17:38:09.796875000 +0000 +++ Makefile (copie de travail)
@@ -62,8 +62,8 @@ @@ -63,8 +63,8 @@
default: $(DEP) x264$(EXE) default: $(DEP) x264$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM) libx264.a: .depend $(OBJS) $(OBJASM)
...@@ -513,7 +513,14 @@ Index: common/i386/mc-a2.asm ...@@ -513,7 +513,14 @@ Index: common/i386/mc-a2.asm
x264$(EXE): libx264.a x264.o matroska.o x264$(EXE): libx264.a x264.o matroska.o
$(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS) $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
@@ -106,8 +106,8 @@ @@ -128,14 +128,14 @@
distclean: clean
rm -f config.mak vfw/build/cygwin/config.mak x264.pc
-install: x264
+install: x264$(EXE)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir) install -m 644 x264.h $(DESTDIR)$(includedir)
install -m 644 libx264.a $(DESTDIR)$(libdir) install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
...@@ -522,5 +529,5 @@ Index: common/i386/mc-a2.asm ...@@ -522,5 +529,5 @@ Index: common/i386/mc-a2.asm
+ install x264$(EXE) $(DESTDIR)$(bindir) + install x264$(EXE) $(DESTDIR)$(bindir)
+ $(RANLIB) $(DESTDIR)$(libdir)/libx264.a + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
.PHONY: uninstall
uninstall: uninstall:
rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment