summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-03-26 22:41:19 +0000
committerkonablend <[email protected]>2009-03-26 22:41:19 +0000
commit5cb3af61b0901b822e451d209108e2d79be6d683 (patch)
tree1f24187d9d99527564d7c03d6c1ccc8169f2f0f5
parent7d552e2d39f8f7d41efb2038fddf01473b982fef (diff)
BuildSystem: added HandBrakeCLI to universal-binary combination.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2276 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--doc/texi/building/chapter.via.terminal.texi2
-rw-r--r--make/variant/darwin.defs5
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi
index dce40f40f..5b6e2cd65 100644
--- a/doc/texi/building/chapter.via.terminal.texi
+++ b/doc/texi/building/chapter.via.terminal.texi
@@ -15,7 +15,7 @@ Configure the build system.
./configure
@end example
-Configure will automatically create a scratch build directory @file{build} unless you use GNU-style build procedures and first @command{cd} to a directory other than top-level source. Additionally you may specify use @command{--build} to specify the directory. The name of the directory is arbitrary but it is recommended to use something which indicates transient files which are @b{not} checked into the repository.
+Configure will automatically create a scratch build directory @file{build} unless you use GNU-style build procedures and first @command{cd} to a directory other than top-level source. Additionally you may use @command{--build} to specify the directory. The name of the directory is arbitrary but it is recommended to use something which indicates transient files which are @b{not} checked into the repository.
The @command{configure} utility accepts many options. It is recommended that you specify @command{--help} for the complete list of options. The following options are also documented here:
diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs
index baffda595..a966826bc 100644
--- a/make/variant/darwin.defs
+++ b/make/variant/darwin.defs
@@ -22,11 +22,16 @@ endef
define UB.COMBINE
$(RM.exe) -fr ub.combine
$(MKDIR.exe) -p ub.combine
+ $(CP.exe) ub.$(UB.first)/HandBrakeCLI ub.combine/.
+ $(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/HandBrakeCLI) -create -output ub.combine/HandBrakeCLI
$(CP.exe) -R ub.$(UB.first)/HandBrake.app ub.combine/.
$(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/$(1)) -create -output ub.combine/$(1)
@lipo -info ub.combine/$(1)
@sync
@echo ""
+ @echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrakeCLI"
+ @echo "$@: UB executable size: `du -sh ub.combine/HandBrakeCLI | awk '{ print $$1 }'`"
+ @echo ""
@echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrake.app"
@echo "$@: UB executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`"
endef