diff options
| author | konablend <[email protected]> | 2012-01-04 09:41:11 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2012-01-04 09:41:11 +0000 |
| commit | 6d95ab81984cc44296438270aa792255f037c89a (patch) | |
| tree | 842d42f935c31a5ec8c1529605cd0226d5d29197 /make/variant/darwin.rules | |
| parent | aad50499b32c44d28a6bae7f353b579e24564e25 (diff) | |
BuildSystem: Mac OS X - transition to Xcode4
- transition from Xcode3 to Xcode4
- overhaul HandBrake.xcodeproj file
- simplify down to 2 configurations: debug, release
- add xcconfig for useful variants: osx106.i386, osx106.x86_64, osx107.i386, osx107.x86_64
- add configure --xcode-config as preferred method to choose OSX minimum version and SDK
- overhaul Info.plist generation to use m4 instead of cpp
- remove use of direct static libraries on command line - Xcode4 now enables -search_paths_first by default
- reference external build static libraries project file - greatly simplifying project file maintenance
- update universal build targets to use --xcode-config
- update ffmpeg hack to build on i386 in both debug and optimized modes
- update ffmpeg build to show compile verbosity
- enable local yasm when yasm probe fails
- remove unused GCC.ldsysroot
- remove unused GCC.ldminver
- enhance xcodemake to use --sysroot, --minver
- update/regenerate docs accordingly
- add support for configure-time repo probe when svn repo is incompatible format to Xcode via .svn/HANDBRAKE_REPO_PROBE
- replaced make/test/build.matrix.darwin with make/test/build.matrix
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4395 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/variant/darwin.rules')
| -rw-r--r-- | make/variant/darwin.rules | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/make/variant/darwin.rules b/make/variant/darwin.rules index d59a222b4..cd0d1ade9 100644 --- a/make/variant/darwin.rules +++ b/make/variant/darwin.rules @@ -1,14 +1,16 @@ .PHONY: ub.build ub.combine ub.clean +ub.build: ub.build.serial + ub.build.serial: @$(UB.BUILD.SERIAL) ub.build.parallel: @set -e; \ - for arch in $(UB.archs); do \ - $(call UB.BUILD.PARALLEL,$$arch) & \ + for xcconfig in $(UB.xcconfigs); do \ + $(call UB.BUILD.PARALLEL,$$xcconfig) & \ children="$$children $$!"; \ - echo "pid $$!: $(call UB.BUILD.PARALLEL,$$arch)"; \ + echo "pid $$!: $(call UB.BUILD.PARALLEL,$$xcconfig)"; \ done; \ echo "waiting for background jobs to complete:$$children"; \ wait @@ -16,5 +18,5 @@ ub.build.parallel: ub.combine: $(call UB.COMBINE,HandBrake.app/Contents/MacOS/HandBrake) -ub.clean: - $(RM.EXE) -fr $(foreach n,$(UB.archs.other),ub.$n) +#ub.clean: +# $(RM.exe) -fr $(foreach n,$(UB.archs.other),ub.$n) |