[avbin commit] r51 - trunk

[codesite...@google.com]

Author: Alex.Holkner
Date: Sat Dec 13 21:31:17 2008
New Revision: 51

Added:
trunk/Makefile.darwin-x86-64
trunk/Makefile.win64
trunk/ffmpeg.configure.darwin-x86-64
trunk/ffmpeg.configure.win64
Modified:
trunk/README
trunk/build.sh

Log:
Add win64 and darwin-x86-64 targets.

Added: trunk/Makefile.darwin-x86-64
==============================================================================
--- (empty file)
+++ trunk/Makefile.darwin-x86-64 Sat Dec 13 21:31:17 2008
@@ -0,0 +1,21 @@
+LIBNAME=$(OUTDIR)/libavbin.$(AVBIN_VERSION).dylib
+
+CFLAGS += -O3 -arch x86_64
+LDFLAGS += -dylib \
+ -read_only_relocs suppress \
+ -single_module \
+ -arch x86_64 \
+ -install_name /usr/local/lib/libavbin.dylib
+
+STATIC_LIBS = $(FFMPEG)/libavformat/libavformat.a \
+ $(FFMPEG)/libavcodec/libavcodec.a \
+ $(FFMPEG)/libavutil/libavutil.a
+
+LIBS = -lSystem \
+ -lz \
+ -lbz2 \
+ /usr/lib/dylib1.o \
+ -L/usr/lib/gcc/i686-apple-darwin9/4.2.1/x86_64/ -lgcc
+
+$(LIBNAME) : $(OBJNAME) $(OUTDIR)
+ $(LD) $(LDFLAGS) -o $@ $< $(STATIC_LIBS) $(LIBS)

Added: trunk/Makefile.win64
==============================================================================
--- (empty file)
+++ trunk/Makefile.win64 Sat Dec 13 21:31:17 2008
@@ -0,0 +1,17 @@
+LIBNAME=$(OUTDIR)/avbin64.dll
+
+CC = x86_64-pc-mingw32-gcc
+
+CFLAGS += -O3
+LDFLAGS += -shared
+
+STATIC_LIBS = -Wl,-whole-archive \
+ -Wl,$(FFMPEG)/libavformat/libavformat.a \
+ -Wl,$(FFMPEG)/libavcodec/libavcodec.a \
+ -Wl,$(FFMPEG)/libavutil/libavutil.a \
+ -Wl,-no-whole-archive
+
+LIBS = -lm -lws2_32
+
+$(LIBNAME) : $(OBJNAME) $(OUTDIR)
+ $(CC) $(LDFLAGS) -o $@ $< $(STATIC_LIBS) $(LIBS)

Modified: trunk/README
==============================================================================
--- trunk/README (original)
+++ trunk/README Sat Dec 13 21:31:17 2008
@@ -83,3 +83,8 @@
In summary, you must note the usage of FFmpeg and AVbin within the
documentation of your application. If you make changes to either library,
you
must include the sources of these changes within your application.
+
+Contributions
+-------------
+
+darwin-x86-64 and win64 targets contributed by Micah Richert.

Modified: trunk/build.sh
==============================================================================
--- trunk/build.sh (original)
+++ trunk/build.sh Sat Dec 13 21:31:17 2008
@@ -110,8 +110,10 @@
echo " linux-x86-64"
echo " darwin-ppc-32"
echo " darwin-x86-32"
- echo " darwin-universal"
+ echo " darwin-x86-64"
+ echo " darwin-universal (32-bit only)"
echo " win32"
+ echo " win64"
exit 1
fi

Added: trunk/ffmpeg.configure.darwin-x86-64
==============================================================================
--- (empty file)
+++ trunk/ffmpeg.configure.darwin-x86-64 Sat Dec 13 21:31:17 2008
@@ -0,0 +1,12 @@
+--enable-static
+--disable-shared
+#--enable-pthreads
+
+--arch=x86_64
+#--cpu=i686
+--extra-cflags='-arch x86_64'
+--extra-ldflags='-arch x86_64'
+
+# Currently broken on Darwin
+#--disable-mmx
+--enable-cross-compile

Added: trunk/ffmpeg.configure.win64
==============================================================================
--- (empty file)
+++ trunk/ffmpeg.configure.win64 Sat Dec 13 21:31:17 2008
@@ -0,0 +1,18 @@
+--enable-cross-compile
+--cross-prefix=x86_64-pc-mingw32-
+--target-os=mingw32
+--enable-memalign-hack
+--arch=x86_64
+#--cpu=i686
+
+--enable-static
+--disable-shared
+
+# trick the check for the right version of mingw32 into working...
+--extra-cflags="-D__MINGW32_MAJOR_VERSION=4"
+
+#these currently aren't supported by the version of w32api currently
provided by mingw w64
+--disable-network
+--disable-avisynth
+--disable-demuxer=vfwcap
+