summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-04-16 17:24:33 +0000
committerjstebbins <[email protected]>2014-04-16 17:24:33 +0000
commite468d11bb75ab7356bdd3d70c84582eecc471d4b (patch)
tree1385614be77ec1743ddce3a85368fe82ff8a22fc /contrib
parentc6c85528383812a0d11c8ce035b1584f35624f7c (diff)
contrib: fix building libvpx on mingw
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6166 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libvpx/module.defs7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index c2c0c4aea..e257d3493 100644
--- 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))