X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Fvariant%2Fdarwin.defs;h=4c9d06bb26c7666e1313eb03e950d3e22b7ecacf;hb=0127c54ac319533945d02788f0a22d02fe699c7a;hp=baffda595b384c5f5380c59df77e61814211590c;hpb=ce32291e230fa2ab820ce17c8a5c0cbff3d98e2c;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs
index baffda59..4c9d06bb 100644
--- a/make/variant/darwin.defs
+++ b/make/variant/darwin.defs
@@ -3,11 +3,11 @@ UB.builds = $(wildcard $(foreach n,$(UB.archs),$(SRC/)build.$n))
 UB.first  = $(word 1,$(UB.archs))
 UB.other  = $(wordlist 2,999,$(UB.archs))
 
-UB.BUILD = $(SRC/)configure --build=ub.$(1) --arch=$(1) --launch --launch-quiet
+UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --arch=$(1) --launch --launch-quiet
 
 ## linefeed is important
 define UB.BUILD.item
-	$(call UB.BUILD,$(1))
+	$(call UB.BUILD,$(1)) --launch-jobs=0
 
 endef
 
@@ -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