contrib: fix building libvpx on mingw

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

diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index c2c0c4aea5a401642acf291c9d3fd3f11b2220be..e257d3493f6a28d93a9a4673851b15d1f9c55992 100644 (file)
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -3,8 +3,6 @@ $(eval $(call import.CONTRIB.defs,LIBVPX))
 
 LIBVPX.FETCH.url = http://download.handbrake.fr/contrib/libvpx-v1.3.0.tar.bz2
 
-LIBVPX.CONFIGURE.env.LD = LD=$(subst CC=,,$(LIBVPX.CONFIGURE.env.CC))
-
 LIBVPX.CONFIGURE.args.host =
 LIBVPX.CONFIGURE.deps  =
 LIBVPX.CONFIGURE.extra =  \
@@ -15,6 +13,11 @@ LIBVPX.CONFIGURE.extra =  \
     --disable-docs        \
     --disable-unit-tests
 
+ifeq (1,$(BUILD.cross))
+    LIBVPX.CONFIGURE.env.CROSS  = CROSS="$(BUILD.spec)-"
+    LIBVPX.CONFIGURE.args.build =
+endif
+
 ifeq (1-i686,$(BUILD.cross)-$(BUILD.machine))
     LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc
 else ifeq (1-x86_64,$(BUILD.cross)-$(BUILD.machine))

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 800f1c56c0c4f6e553979500ecbe0d505cdaaa7b..2c16c5b3c0f204897b18520d11acbc69269b916d 100644 (file)
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -108,7 +108,7 @@ define import.CONTRIB.defs
     $(1).CONFIGURE.env.LDFLAGS  = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)"
     $(1).CONFIGURE.env.PKG_CONFIG_PATH  = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig"
 
-    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
+    $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH !CROSS
     $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
 
     $(1).CONFIGURE.target = $$($(1).build/).stamp.configure