diff options
| author | konablend <[email protected]> | 2009-03-08 22:50:57 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-03-08 22:50:57 +0000 |
| commit | 083ba4898a662cd50a86d2a65ca5ebe765fe882d (patch) | |
| tree | c2460805275e7b23dd03965df15beecc7ac4589b /macosx/module.defs | |
| parent | 92d511d944b059caaf6c5e85fcb5202642aa4553 (diff) | |
BuildSystem: general, configure and Xcode updates.
*** NOTICE:
This changeset requires a clean build directory. Please issue 'make xclean' inside
build dir(s) after 'svn up'. This will help ensure there are no unexpected results.
*** GENERAL:
- renamed makevar PROJECT/ -> SRC/ for clarity.
- renamed makevar PREFIX.install/ -> PREFIX/ for clarity.
- split custom GNUmakefile overrides into defs/rules files.
- inserted optional level of make customization at SRC/ level; see docs.
- dropped HB.repo.wcversion (svnversion is no longer used).
- corrected several 'rm' usages to use -f flag which avoids some build errors.
- refreshed generated 00-Building.*.txt docs; work still in progress on the wiki front.
*** CONFIGURE:
- made configure more robust; configure may now be run outside of build directory!
- adding log recording of configure activities.
- improved readability of default options for configure
- added:
--force overwrite existing build config
--src=DIR specify top-level source dir [.]
--build=DIR specify build scratch/output dir [.]
--prefix=DIR specify install dir for products [/Applications]
- dropped --launch-force (replaced by --force)
- dropped --launch-dir (replaced by --build)
- dropped --launch-log
*** XCODE:
- renamed pbxproj definition EXTERNAL_PROJECT -> EXTERNAL_SRC for clarity.
- fixed all configurations to default to EXTERNAL_JOBS=1 .
- enabled Xcode internal parallelization (libhb, HandBrakeCLI and HandBrake benefit).
- make now tickles Xcode build files to cause Info.plist regeneration and posting to HandBrake.app output;
ie: svn up; click build and HandBrake.app's about panel will reflect the new repository rev.
*** DARWIN:
- added support to build universal binaries; see docs.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2242 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/module.defs')
| -rw-r--r-- | macosx/module.defs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/macosx/module.defs b/macosx/module.defs index fec467db9..75b9655ae 100644 --- a/macosx/module.defs +++ b/macosx/module.defs @@ -1,10 +1,13 @@ $(eval $(call import.MODULE.defs,MACOSX,macosx)) -MACOSX.src/ = $(PROJECT/)macosx/ +MACOSX.src/ = $(SRC/)macosx/ MACOSX.build/ = $(BUILD/)macosx/ MACOSX.m4.in = $(wildcard $(MACOSX.src/)*.m4) -MACOSX.m4.out = $(patsubst $(MACOSX.src/)%.m4,$(MACOSX.build/)%,$(MACOSX.m4.in)) +MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%) + +## optional special command to run post macro processing +MACOSX.m4.post.Info.h = $(RM.exe) -f $(MACOSX.build/)HandBrake.build/Preprocessed-Info.plist MACOSX.targs = HandBrakeCLI HandBrake MACOSX.conf = standard$(if $(filter 1,$(BUILD.cross)),.$(BUILD.arch)) @@ -12,6 +15,7 @@ MACOSX.conf = standard$(if $(filter 1,$(BUILD.cross)),.$(BUILD.arch)) ############################################################################### BUILD.out += $(MACOSX.m4.out) +BUILD.out += $(MACOSX.m4.wc.out) ############################################################################### @@ -30,10 +34,11 @@ MACOSX.XCODE = $(strip \ -project $(MACOSX.XCODE.project) \ -configuration $(MACOSX.conf) \ $(foreach t,$(1),-target $t) \ - EXTERNAL_BUILD='$(CURDIR)' \ + EXTERNAL_SRC='$(XCODE.external.src)' \ + EXTERNAL_BUILD='$(XCODE.external.build)' \ + EXTERNAL_PREFIX='$(XCODE.external.prefix)' \ EXTERNAL_JOBS='$(BUILD.jobs)' \ EXTERNAL_METHOD='$(CONF.method)' \ - EXTERNAL_PROJECT='$(PROJECT/)' \ EXTERNAL_GOALS='$(3)' \ EXTERNAL_VARS='$(-*-command-variables-*-)' \ $(2) ) |