summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-08-18 20:38:49 +0000
committerjstebbins <[email protected]>2014-08-18 20:38:49 +0000
commit91b320ac593bc538c50233292a9d4642f492fa4d (patch)
tree8dd9a78479382a12804d1eeedb4f90b4a4b680a2 /make
parentb6368d97cac44a2b35807760b725d92076675280 (diff)
LinGui: link lame and x264 system libs
These projects have been stable long enough that we should not need to worry about broken system libs any more. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6312 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
-rw-r--r--make/include/main.defs5
1 files changed, 2 insertions, 3 deletions
diff --git a/make/include/main.defs b/make/include/main.defs
index e756e9565..504d814cc 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -39,6 +39,8 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
MODULES += contrib/libvorbis
MODULES += contrib/libtheora
MODULES += contrib/libsamplerate
+ MODULES += contrib/lame
+ MODULES += contrib/x264
endif
ifeq (1,$(FEATURE.fdk_aac))
@@ -49,7 +51,6 @@ ifeq (1,$(FEATURE.x265))
MODULES += contrib/x265
endif
-MODULES += contrib/lame
MODULES += contrib/ffmpeg
MODULES += contrib/libvpx
MODULES += contrib/libdvdread
@@ -66,8 +67,6 @@ ifeq (1,$(FEATURE.qsv))
MODULES += contrib/libmfx
endif
-MODULES += contrib/x264
-
ifneq (,$(filter $(BUILD.system),cygwin mingw))
ifneq ($(HAS.iconv),1)
MODULES += contrib/libiconv