diff options
| author | konablend <[email protected]> | 2009-03-04 00:54:53 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-03-04 00:54:53 +0000 |
| commit | 6d2d51974af122bdfe6eb82f355e270cd66c48af (patch) | |
| tree | 5a82b3790f4dd0c3f71aa1643838e937edca597a /macosx/module.defs | |
| parent | c4d9c49de0f020f451325dbb39b97642eaf96032 (diff) | |
BuildSystem: darwin
- made Xcode external targets consistent for each configuration.
- shunted terminal NAME=VALUE vars through xcodebuild.
- folded macosx/module.xcode shunt functions into single.
- added new report target to show a single var; eg: make report.var NAME=GCC.gcc .
BuildSystem: darwin ppc
- fixed configure on ppc host: correctly identify native architecture.
- fixed configure to be more resilient when svn probes fail.
- fixed configure to show error output for svn probes.
BuildSystme: xcode
- added external target 'external' to represent 'all things in external system'
which is slight more than what 'libhb' might represent.
- added doc section Building.osx: External Targets .
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2214 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/module.defs')
| -rw-r--r-- | macosx/module.defs | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/macosx/module.defs b/macosx/module.defs index 2b525acde..fec467db9 100644 --- a/macosx/module.defs +++ b/macosx/module.defs @@ -18,27 +18,22 @@ BUILD.out += $(MACOSX.m4.out) MACOSX.XCODE.exe = xcodebuild MACOSX.XCODE.project = HandBrake.xcodeproj +## launch a build thru xcode; which in turn will do a nested make against +## this build system with normal build rules enabled. +## +## $(1) = list of targets +## $(2) = list of goals to shunt thru xcodebuild->make +## MACOSX.XCODE = $(strip \ cd $(MACOSX.src/) && \ $(MACOSX.XCODE.exe) \ -project $(MACOSX.XCODE.project) \ -configuration $(MACOSX.conf) \ - $(foreach t,$(MACOSX.targs),-target $t) \ + $(foreach t,$(1),-target $t) \ EXTERNAL_BUILD='$(CURDIR)' \ EXTERNAL_JOBS='$(BUILD.jobs)' \ EXTERNAL_METHOD='$(CONF.method)' \ EXTERNAL_PROJECT='$(PROJECT/)' \ - $(1) ) - -MACOSX.XCODE.PASSTHRU = $(strip \ - cd $(MACOSX.src/) && \ - $(MACOSX.XCODE.exe) \ - -project $(MACOSX.XCODE.project) \ - -configuration $(MACOSX.conf) \ - -target libhb \ - EXTERNAL_BUILD='$(CURDIR)' \ - EXTERNAL_JOBS='$(BUILD.jobs)' \ - EXTERNAL_METHOD='$(CONF.method)' \ - EXTERNAL_PROJECT='$(PROJECT/)' \ - EXTERNAL_GOALS='$(1)' \ - build ) + EXTERNAL_GOALS='$(3)' \ + EXTERNAL_VARS='$(-*-command-variables-*-)' \ + $(2) ) |