diff options
author | konablend <[email protected]> | 2009-03-11 05:18:47 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2009-03-11 05:18:47 +0000 |
commit | df05598ade2fadeda033b1752491e2ae44faedfc (patch) | |
tree | 07738479b174a097d8bc29fc7026e3c999aa3773 /make/xcodemake | |
parent | 1317c0d6d70d62f8a2442c3df429a3cf4dfddb31 (diff) |
BuildSystem: darwin + Xcode dependencies and enhancements
This changeset focuses on a disconnect between Xcode targets HandBrakeCLI and HandBrake.app when
changest to external dependencies are made. The use case is to touch any .c file in libhb
which then builds .o and re-creates libhb.a; next the Xcode targets should at least re-link.
This did not happen because link-flags are used to add libhb.a and contrib libraries in Xcode;
which effectively hides them from Xcode.
The solution removes libhb.a from link-flags mechanism and places libhb.a as a framework library
known to Xcode; and the expected re-linking occurs. contrib libraries will continue to use link-flags
but since libhb.a has coarse-grained dependencies on contrib modules this will also cause Xcode
targets to re-link.
Further enhancements made to Xcode project:
- Xcode now scans any .c files for .h file dependencies; will help with Xcode sources;
the effect against libhb.a is moot; libhb.a will be rebuilt by external system anyways.
- libbz2 and libz are now treated as framework libraries; it's more correct than listing
all libraries as link-flags.
- moved FRAMEWORK_SEARCH_PATHS to project-level for consistency in future targets.
- moved LIBRARY_SEARCH_PATHS to project-level for conistency.
- enabled GCC_WARN_TYPECHECK_CALLS_TO_PRINTF at project-level.
[this changeset should not be a factor for other platforms; no side effects are expected]
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2257 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/xcodemake')
-rwxr-xr-x | make/xcodemake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/make/xcodemake b/make/xcodemake index aca4c41cd..4854ec2d4 100755 --- a/make/xcodemake +++ b/make/xcodemake @@ -49,9 +49,8 @@ if [ -n "$reconfigure" ]; then esac ## invoke configure with (hidden) option which indicates conf performed by xcode - (set -x; $EXTERNAL_SRC/configure --force --build=$EXTERNAL_BUILD \ - $EXTERNAL_CONFARGS \ - --arch=$ARCHS $debug --conf-method=xcode PATH=$PATH ) + (set -x; $EXTERNAL_SRC/configure --force $EXTERNAL_CONFARGS \ + --build=$EXTERNAL_BUILD --arch=$ARCHS $debug --conf-method=xcode PATH=$PATH ) fi ## compute goals; these correlate with TARGET_NAME and ACTION from Xcode |