diff options
| author | bradleys <[email protected]> | 2015-02-11 20:42:05 +0000 |
|---|---|---|
| committer | bradleys <[email protected]> | 2015-02-11 20:42:05 +0000 |
| commit | 90bb32c1fc211087736ca52e267c19bf0239bdfe (patch) | |
| tree | 60271db2922624b895efe087a4a5b801ad128d6b | |
| parent | 7fdc8aad2540f0129ce17efdfa72fb7ad53b8d9f (diff) | |
libhb: Fix lame and i686/mingw builds with SSE enabled.
Also fix an old typo in gcc.defs.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6895 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/lame/A00-xmmintrin.patch (renamed from contrib/lame/P00-darwin-xmmintrin.patch) | 6 | ||||
| -rw-r--r-- | make/include/gcc.defs | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/contrib/lame/P00-darwin-xmmintrin.patch b/contrib/lame/A00-xmmintrin.patch index de19e55ba..0b5237162 100644 --- a/contrib/lame/P00-darwin-xmmintrin.patch +++ b/contrib/lame/A00-xmmintrin.patch @@ -1,13 +1,13 @@ diff -Naur lame.orig/configure lame/configure ---- lame.orig/configure 2008-06-29 17:40:05.000000000 -0400 -+++ lame/configure 2008-10-14 05:01:29.000000000 -0400 +--- lame.orig/configure 2015-02-08 17:37:18.000000000 -0500 ++++ lame/configure 2015-02-08 17:38:32.000000000 -0500 @@ -21031,7 +21031,14 @@ - +case $host_cpu in -+powerpc*) ++powerpc*|i686*) + check_xmmintrin= + ;; +*) diff --git a/make/include/gcc.defs b/make/include/gcc.defs index 93d847575..222e6e4f5 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -47,11 +47,7 @@ GCC.args.ML = -fmessage-length=0 GCC.args.H = -H GCC.args.W = -W$(1) ifeq (darwin,$(BUILD.system)) - GCC.args.archs = -arch $(1) -else ifeq (linux-i686,$(BUILD.system)-$(BUILD.arch)) - GCC.args.archs = -msse2 -else - GCC.args.archs = + GCC.args.archs = -arch $(1) endif GCC.args.sysroot = --sysroot=$(1) GCC.args.minver = -mmacosx-version-min=$(1) @@ -75,7 +71,11 @@ GCC.args.L = -L$(1) GCC.args.l = -l$(1) GCC.args.end = -Wl,--end-group -GCC.args.extra = $(CFLAGS) $(CPPFLAGS) +ifeq ($(BUILD.machine),$(filter $(BUILD.machine),i686 x86_64)) + GCC.args.extra = $(CFLAGS) $(CPPFLAGS) -mfpmath=sse -msse2 +else + GCC.args.extra = $(CFLAGS) $(CPPFLAGS) +endif GCC.args.extra.h_o = GCC.args.extra.c_o = GCC.args.extra.dylib = $(LDFLAGS) @@ -199,7 +199,7 @@ define import.GCC $(1).GCC.EXE = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.EXE.args),$$(1),$$(2)) # FUNCTION: C++ link dynamic-lib - $(1).GCC.DYLIB++.args = !gxx ?pipe ?strip ?dylib ?extra.dylib++ ?ML *W *arch *sysroot *minvers ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end + $(1).GCC.DYLIB++.args = !gxx ?pipe ?strip ?dylib ?extra.dylib++ ?ML *W *archs *sysroot *minvers ?vis ?pic .g .O ?extra *D *I !o ?muldefs ?start !i *F *f *L *l *i !a ?end $(1).GCC.DYLIB++ = $$(call fn.ARGS,$(1).GCC,$$($(1).GCC.DYLIB++.args),$$(1),$$(2)) # FUNCTION: C++ link executable |