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/HandBrake.xcodeproj/project.pbxproj | |
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/HandBrake.xcodeproj/project.pbxproj')
-rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 690e8b95b..c93959cf5 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ /* Begin PBXLegacyTarget section */ 27F143770F5DF34F00A684FF /* external */ = { isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake"; + buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; buildConfigurationList = 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */; buildPhases = ( ); @@ -413,7 +413,7 @@ }; 27F1437E0F5DF36000A684FF /* contrib */ = { isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake"; + buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; buildConfigurationList = 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */; buildPhases = ( ); @@ -426,7 +426,7 @@ }; 27F143850F5DF37600A684FF /* libhb */ = { isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_PROJECT/make/xcodemake"; + buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; buildConfigurationList = 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */; buildPhases = ( ); @@ -482,6 +482,9 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + }; buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; @@ -735,10 +738,10 @@ ARCHS = i386; CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -844,10 +847,10 @@ ARCHS = ppc; CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -953,10 +956,10 @@ ARCHS = x86_64; CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1062,10 +1065,10 @@ ARCHS = ppc64; CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1403,10 +1406,10 @@ CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 8; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; + EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1427,10 +1430,10 @@ buildSettings = { CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_PROJECT)/build.$(CONFIGURATION)"; + EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; EXTERNAL_JOBS = 1; EXTERNAL_METHOD = xcode; - EXTERNAL_PROJECT = ..; + EXTERNAL_SRC = ..; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; |