build: fix linux i686 build

Adds -msse2 to compiler flags which is needed by new nlmeans sse acceleration

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6837 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/make/configure.py b/make/configure.py
index 5f155fd701dfcf44ff777386da5c9d0b026d1155..89221f6cd93324a8630f699bdf7c2548f7b8d64a 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -1763,12 +1763,11 @@ int main()
         select.doc_add( doc )
 
     doc.addBlank()
+    doc.add( 'GCC.archs', arch.mode.mode )
     if build.match( '*-*-darwin*' ):
-        doc.add( 'GCC.archs', arch.mode.mode )
         doc.add( 'GCC.sysroot', cfg.sysroot_dir )
         doc.add( 'GCC.minver', cfg.minver )
     else:
-        doc.add( 'GCC.archs', '' )
         doc.add( 'GCC.sysroot', '' )
         doc.add( 'GCC.minver', '' )
 

diff --git a/make/include/gcc.defs b/make/include/gcc.defs
index b27c4a6ced2810bc3a415581cdac9f2742a3be32..93d847575736f5547ddc95fa9627a48690f68e2d 100644 (file)
--- a/make/include/gcc.defs
+++ b/make/include/gcc.defs
@@ -46,7 +46,13 @@ GCC.args.dylib     = -dynamiclib
 GCC.args.ML        = -fmessage-length=0
 GCC.args.H         = -H
 GCC.args.W         = -W$(1)
-GCC.args.archs     = -arch $(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     =
+endif
 GCC.args.sysroot   = --sysroot=$(1)
 GCC.args.minver    = -mmacosx-version-min=$(1)
 GCC.args.vis       = -fvisibility=hidden