summaryrefslogtreecommitdiffstats
path: root/make/include
diff options
context:
space:
mode:
authorjstebbins <jstebbins.hb@gmail.com>2014-04-15 18:42:17 +0000
committerjstebbins <jstebbins.hb@gmail.com>2014-04-15 18:42:17 +0000
commitc6c85528383812a0d11c8ce035b1584f35624f7c (patch)
tree30409e8e361022168d608cda17bc1abe1b2c515e /make/include
parentc973315226c1009f2cadc8a14e5219c1ef5d69c2 (diff)
Add VP8 support
Thanks to Matthew Harvey for this patch git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6165 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/include')
-rw-r--r--make/include/contrib.defs2
-rw-r--r--make/include/main.defs1
2 files changed, 2 insertions, 1 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index fffddb8ca..800f1c56c 100644
--- 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 !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
+ $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH
$(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args))
$(1).CONFIGURE.target = $$($(1).build/).stamp.configure
diff --git a/make/include/main.defs b/make/include/main.defs
index d3276067c..513afe116 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -59,6 +59,7 @@ endif
MODULES += contrib/lame
MODULES += contrib/ffmpeg
+MODULES += contrib/libvpx
MODULES += contrib/libdvdread
MODULES += contrib/libdvdnav
MODULES += contrib/libbluray