diff options
| author | Damiano Galassi <[email protected]> | 2020-10-30 14:38:20 +0100 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2020-11-05 09:49:16 +0100 |
| commit | 25da8ed4896f43c86c0a9eaedf09b4b883f43227 (patch) | |
| tree | ec839a2dcdfa9494834a9ae079b2942db5290ab6 /make | |
| parent | b7de6666eb2112cd6dc3eb3f05427e03d6f13519 (diff) | |
build: improve ub target to generate a arm64/x86_64 binary.
Diffstat (limited to 'make')
| -rw-r--r-- | make/variant/darwin.defs | 38 | ||||
| -rw-r--r-- | make/variant/darwin.rules | 22 |
2 files changed, 0 insertions, 60 deletions
diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs index ec17f9e5f..e69de29bb 100644 --- a/make/variant/darwin.defs +++ b/make/variant/darwin.defs @@ -1,38 +0,0 @@ -UB.xcconfigs = osx1011.x86_64 -UB.builds = $(wildcard $(foreach n,$(UB.xcconfigs),$(SRC/)build.$n)) -UB.first = $(word 1,$(UB.xcconfigs)) -UB.more = $(wordlist 2,999,$(UB.xcconfigs)) -UB.products/ = macosx/release/ - -UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --xcconfig=$(1) --launch --launch-quiet - -## linefeed is important -define UB.BUILD.item - $(call UB.BUILD,$(1)) --launch-jobs=0 - -endef - -define UB.BUILD.SERIAL - $(foreach n,$(UB.xcconfigs),$(call UB.BUILD.item,$n)) -endef - -define UB.BUILD.PARALLEL - $(call UB.BUILD,$(1)) >/dev/null 2>&1 -endef - -define UB.COMBINE - $(RM.exe) -fr ub.combine - $(MKDIR.exe) -p ub.combine - $(CP.exe) ub.$(UB.first)/$(UB.products/)HandBrakeCLI ub.combine/. - $(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)HandBrakeCLI) -create -output ub.combine/HandBrakeCLI - $(CP.exe) -R ub.$(UB.first)/$(UB.products/)HandBrake.app ub.combine/. - $(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)$(1)) -create -output ub.combine/$(1) - @lipo -info ub.combine/$(1) - @sync - @echo "" - @echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrakeCLI" - @echo "$@: UB executable size: `du -sh ub.combine/HandBrakeCLI | awk '{ print $$1 }'`" - @echo "" - @echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrake.app" - @echo "$@: UB executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`" -endef diff --git a/make/variant/darwin.rules b/make/variant/darwin.rules deleted file mode 100644 index cd0d1ade9..000000000 --- a/make/variant/darwin.rules +++ /dev/null @@ -1,22 +0,0 @@ -.PHONY: ub.build ub.combine ub.clean - -ub.build: ub.build.serial - -ub.build.serial: - @$(UB.BUILD.SERIAL) - -ub.build.parallel: - @set -e; \ - for xcconfig in $(UB.xcconfigs); do \ - $(call UB.BUILD.PARALLEL,$$xcconfig) & \ - children="$$children $$!"; \ - echo "pid $$!: $(call UB.BUILD.PARALLEL,$$xcconfig)"; \ - done; \ - echo "waiting for background jobs to complete:$$children"; \ - wait - -ub.combine: - $(call UB.COMBINE,HandBrake.app/Contents/MacOS/HandBrake) - -#ub.clean: -# $(RM.exe) -fr $(foreach n,$(UB.archs.other),ub.$n) |