Commit 669d2f81 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Yet another x264 contrib patch for win32
parent a3139ceb
Index: configure Index: configure
=================================================================== ===================================================================
--- configure (revision 538) --- configure (rvision 547)
+++ configure (working copy) +++ configure (copie de travail)
@@ -7,6 +7,7 @@ @@ -66,48 +66,147 @@
echo "available options:"
echo ""
echo " --help print this message"
+echo " --crosscompile=ARCH crosscompile for ARCH"
echo " --enable-avis-input enables avisynth input (win32 only)"
echo " --enable-mp4-output enables mp4 output (using gpac)"
echo " --enable-vfw compiles the VfW frontend"
@@ -64,48 +65,147 @@
EXE="" EXE=""
...@@ -168,7 +160,7 @@ Index: configure ...@@ -168,7 +160,7 @@ Index: configure
SYS="SunOS" SYS="SunOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H" CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm" LDFLAGS="$LDFLAGS -lm"
@@ -117,9 +217,8 @@ @@ -119,9 +218,8 @@
;; ;;
esac esac
...@@ -179,7 +171,7 @@ Index: configure ...@@ -179,7 +171,7 @@ Index: configure
ARCH="X86" ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
AS="nasm" AS="nasm"
@@ -140,7 +239,7 @@ @@ -142,7 +240,7 @@
AS="yasm" AS="yasm"
ASFLAGS="-f elf -m amd64" ASFLAGS="-f elf -m amd64"
;; ;;
...@@ -188,12 +180,11 @@ Index: configure ...@@ -188,12 +180,11 @@ Index: configure
ARCH="PPC" ARCH="PPC"
if [ $SYS = MACOSX ] if [ $SYS = MACOSX ]
then then
@@ -188,90 +287,7 @@ @@ -191,95 +289,6 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS" CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
-# parse options # parse options
-
-for opt do -for opt do
- optarg="${opt#*=}" - optarg="${opt#*=}"
- case "$opt" in - case "$opt" in
...@@ -259,6 +250,12 @@ Index: configure ...@@ -259,6 +250,12 @@ Index: configure
- --disable-vfw) - --disable-vfw)
- vfw="no" - vfw="no"
- ;; - ;;
- --enable-gtk)
- gtk="yes"
- ;;
- --disable-gtk)
- gtk="no"
- ;;
- --enable-shared) - --enable-shared)
- shared="yes" - shared="yes"
- if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then - if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
...@@ -279,9 +276,9 @@ Index: configure ...@@ -279,9 +276,9 @@ Index: configure
# autodetect options that weren't forced nor disabled # autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then if test "$pthread" = "auto" ; then
@@ -356,6 +372,9 @@ @@ -365,6 +374,9 @@
ASFLAGS=$ASFLAGS
VFW=$vfw VFW=$vfw
GTK=$gtk
EXE=$EXE EXE=$EXE
+AR=$AR +AR=$AR
+AROPTS=$AROPTS +AROPTS=$AROPTS
...@@ -291,8 +288,8 @@ Index: configure ...@@ -291,8 +288,8 @@ Index: configure
DEVNULL=$DEVNULL DEVNULL=$DEVNULL
Index: Makefile Index: Makefile
=================================================================== ===================================================================
--- Makefile (revision 538) --- Makefile (rvision 547)
+++ Makefile (working copy) +++ Makefile (copie de travail)
@@ -64,8 +64,8 @@ @@ -64,8 +64,8 @@
default: $(DEP) x264$(EXE) default: $(DEP) x264$(EXE)
...@@ -304,9 +301,9 @@ Index: Makefile ...@@ -304,9 +301,9 @@ Index: Makefile
$(SONAME): .depend $(OBJS) $(OBJASM) $(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -134,14 +134,14 @@ @@ -138,14 +138,14 @@
distclean: clean rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
rm -f config.mak config.h vfw/build/cygwin/config.mak gtk/config.mak x264.pc $(MAKE) -C gtk distclean
-install: x264 $(SONAME) -install: x264 $(SONAME)
+install: x264$(EXE) +install: x264$(EXE)
......
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