diff options
author | konablend <[email protected]> | 2013-09-24 00:14:48 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2013-09-24 00:14:48 +0000 |
commit | c0d3a073e6309939a82b58d9aa693084b088644c (patch) | |
tree | c35b319b0a6cf293215a4e9ef9a24bfced92d17f /macosx/xcconfig | |
parent | 203b7a961fca0513ad09c1b9761faeac26d2edd0 (diff) |
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
Diffstat (limited to 'macosx/xcconfig')
-rw-r--r-- | macosx/xcconfig/base/os.osx108.xcconfig | 2 | ||||
-rw-r--r-- | macosx/xcconfig/native.xcconfig | 1 | ||||
-rw-r--r-- | macosx/xcconfig/osx108.i386.xcconfig | 3 | ||||
-rw-r--r-- | macosx/xcconfig/osx108.x86_64.xcconfig | 3 | ||||
-rw-r--r-- | macosx/xcconfig/supplemental.xcconfig | 4 |
5 files changed, 13 insertions, 0 deletions
diff --git a/macosx/xcconfig/base/os.osx108.xcconfig b/macosx/xcconfig/base/os.osx108.xcconfig new file mode 100644 index 000000000..6da71a91f --- /dev/null +++ b/macosx/xcconfig/base/os.osx108.xcconfig @@ -0,0 +1,2 @@ +SDKROOT = macosx10.8 +MACOSX_DEPLOYMENT_TARGET = 10.8 diff --git a/macosx/xcconfig/native.xcconfig b/macosx/xcconfig/native.xcconfig index d88c8c44f..c110fc712 100644 --- a/macosx/xcconfig/native.xcconfig +++ b/macosx/xcconfig/native.xcconfig @@ -1,2 +1,3 @@ #include "base/arch.native.xcconfig" EXTERNAL_XCCONFIG = native +#include "supplemental.xcconfig" diff --git a/macosx/xcconfig/osx108.i386.xcconfig b/macosx/xcconfig/osx108.i386.xcconfig new file mode 100644 index 000000000..d3dcc668c --- /dev/null +++ b/macosx/xcconfig/osx108.i386.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx108.xcconfig" +#include "base/arch.i386.xcconfig" +EXTERNAL_XCCONFIG = osx108.i386 diff --git a/macosx/xcconfig/osx108.x86_64.xcconfig b/macosx/xcconfig/osx108.x86_64.xcconfig new file mode 100644 index 000000000..4e602e8ab --- /dev/null +++ b/macosx/xcconfig/osx108.x86_64.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx108.xcconfig" +#include "base/arch.x86_64.xcconfig" +EXTERNAL_XCCONFIG = osx108.x86_64 diff --git a/macosx/xcconfig/supplemental.xcconfig b/macosx/xcconfig/supplemental.xcconfig new file mode 100644 index 000000000..a92536f8d --- /dev/null +++ b/macosx/xcconfig/supplemental.xcconfig @@ -0,0 +1,4 @@ +// ## THIS FILE IS INTENDED FOR LOCAL WORKSPACE ONLY. +// ## THIS FILE SHOULD NEVER BE COMMITTED TO REPOSITORY WITH UNCOMMENTED LINES. + +// EXTERNAL_CONFIGURE = --disable-mp4v2 --disable-mkv |