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

1 files changed, 4 insertions, 20 deletions

diff --git a/macosx/module.defs b/macosx/module.defs
index 39edaa405..e9cbc8636 100644
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -7,10 +7,12 @@ MACOSX.build/ = $(BUILD/)macosx/
 MACOSX.m4.in  = $(wildcard $(MACOSX.src/)*.m4)
 MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%)
 
+MACOSX.osl.filelist = $(MACOSX.build/)osl.filelist.txt
+
 ###############################################################################
 
 BUILD.out += $(MACOSX.m4.out)
-BUILD.out += $(MACOSX.m4.wc.out)
+BUILD.out += $(MACOSX.osl.filelist)
 
 ###############################################################################
 
@@ -26,25 +28,8 @@ MACOSX.map.g.std  = debug
 MACOSX.map.g.max  = debug
 
 ifeq (1,$(FEATURE.opencl))
-MACOSX.extra_cflags = OTHER_CFLAGS='-DUSE_OPENCL'
-endif
-
-ifeq (1,$(FEATURE.fdk_aac))
-    extra_libs += $(abspath $(BUILD))/contrib/lib/libfdk-aac.a
-endif
-
-ifeq (1,$(FEATURE.faac))
-    extra_libs += $(abspath $(BUILD))/contrib/lib/libfaac.a
-endif
-
-ifeq (1,$(FEATURE.mp4v2))
-    extra_libs += $(abspath $(BUILD))/contrib/lib/libmp4v2.a
-endif
-
-ifeq (1,$(FEATURE.libmkv))
-    extra_libs += $(abspath $(BUILD))/contrib/lib/libmkv.a
+    MACOSX.extra_cflags = OTHER_CFLAGS='-DUSE_OPENCL'
 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))
@@ -76,6 +61,5 @@ MACOSX.XCODE = $(strip \
         EXTERNAL_VARS='$(-*-command-variables-*-)' \
         \
         $(MACOSX.extra_cflags) \
-        $(MACOSX.extra_ldflags) \
         \
         $(2) )