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 /make/include/main.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 'make/include/main.defs')
| -rw-r--r-- | make/include/main.defs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/make/include/main.defs b/make/include/main.defs index 93271a365..f07678b79 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -1,10 +1,10 @@ -include $(PROJECT/)make/include/base.defs -include $(PROJECT/)make/include/contrib.defs -include $(PROJECT/)make/include/function.defs -include $(PROJECT/)make/include/gcc.defs -include $(PROJECT/)make/include/select.defs -include $(PROJECT/)make/include/target.defs -include $(PROJECT/)make/include/tool.defs +include $(SRC/)make/include/base.defs +include $(SRC/)make/include/contrib.defs +include $(SRC/)make/include/function.defs +include $(SRC/)make/include/gcc.defs +include $(SRC/)make/include/select.defs +include $(SRC/)make/include/target.defs +include $(SRC/)make/include/tool.defs ############################################################################### @@ -62,6 +62,6 @@ MODULES += doc ############################################################################### -include $(MODULES:%=$(PROJECT/)%/module.defs) -include $(PROJECT/)make/variant/$(HOST.system).defs --include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.machine).defs +include $(MODULES:%=$(SRC/)%/module.defs) +include $(SRC/)make/variant/$(HOST.system).defs +-include $(SRC/)make/variant/$(HOST.system).$(BUILD.machine).defs |