summaryrefslogtreecommitdiffstats
path: root/macosx/module.defs
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-06-15 17:24:35 +0000
committerjstebbins <[email protected]>2013-06-15 17:24:35 +0000
commit768561ada96cd0149ed115748c95a32357676b38 (patch)
treef3133420c26ba3955476aaab30e829555745e57b /macosx/module.defs
parentc0a3e42fcb044932defaa420ce9ecaeed54db9a3 (diff)
improve aac encoder build options and change some aac encoder defaults
By default, faac is no longer built. Libav aac is now the default aac encoder on all platforms except osx where ca_aac is the default. fdk-aac is now built by default (except on osx). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5581 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/module.defs')
-rw-r--r--macosx/module.defs7
1 files changed, 6 insertions, 1 deletions
diff --git a/macosx/module.defs b/macosx/module.defs
index 1870d5fe9..1a2b6f81d 100644
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -26,9 +26,14 @@ MACOSX.map.g.std = debug
MACOSX.map.g.max = debug
ifeq (1,$(FEATURE.fdk_aac))
-MACOSX.extra_ldflags = OTHER_LDFLAGS='$(abspath $(BUILD))/contrib/lib/libfdk-aac.a'
+ extra_libs += $(abspath $(BUILD))/contrib/lib/libfdk-aac.a
endif
+ifeq (1,$(FEATURE.faac))
+ extra_libs += $(abspath $(BUILD))/contrib/lib/libfaac.a
+endif
+MACOSX.extra_ldflags = OTHER_LDFLAGS='$(extra_libs)'
+
## xcconfig: must be one of macosx/xcconfig/*.xcconfig
MACOSX.xcconfig = $(foreach x,$(XCODE.xcconfig),-xcconfig $(MACOSX.src/)xcconfig/$(x))
MACOSX.sdk = $(foreach sdk,$(GCC.sysroot),-sdk $(sdk))