From c0d3a073e6309939a82b58d9aa693084b088644c Mon Sep 17 00:00:00 2001 From: konablend Date: Tue, 24 Sep 2013 00:14:48 +0000 Subject: BuildSystem: initial Xcode5 support Tested on MacOSX 10.8.5 w/ Xcode 5.0, 4.6.3 and 4.5.2, various builds, including terminal Xcode, terminal no Xcode and Xcode IDE, and permutations with/without mp4v2 and mkv. - push defs for optional static libraries (OSL) to respective modules - adjust make-driven linking to use OSL - adjust Xcode-driven linking to use OSL via ld -filelist option - add Xcode project group for all OSL - set Xcode project to use clang compiler - add osx 10.8 xcconfig files - add "supplemental" xcconfig file where EXTERNAL_CONFIGURE may be used to specify configure-time options - patch mp4v2 to compile with clang Intructions for custom configure-options within Xcode IDE: 1. edit macosx/xcconfig/supplemental.xcconfig 2. save file (unsure how long it takes IDE to see change but it does) 3. build clean 4. build 5. never commit supplemental.xcconfig to repository - it is meant to exist but not effect the build on a clean checkout, and to be used only as a developer transient developer customization file. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5800 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- test/module.defs | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'test') diff --git a/test/module.defs b/test/module.defs index b7c824cf9..e85ba838a 100644 --- a/test/module.defs +++ b/test/module.defs @@ -20,25 +20,10 @@ TEST.GCC.l = \ bluray xml2 bz2 z ifeq (1,$(FEATURE.qsv)) - TEST.GCC.l += mfx TEST.GCC.D += USE_QSV HAVE_THREADS=1 endif -ifeq (1,$(FEATURE.fdk_aac)) -TEST.GCC.l += fdk-aac -endif - -ifeq (1,$(FEATURE.faac)) -TEST.GCC.l += faac -endif - -ifeq (1,$(FEATURE.mp4v2)) -TEST.GCC.l += mp4v2 -endif - -ifeq (1,$(FEATURE.libmkv)) -TEST.GCC.l += mkv -endif +TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs)) TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe)) -- cgit v1.2.3