infrastructure/blender-open-data
2
3
Fork 3
Code Issues 15 Pull Requests 1 Projects Releases Wiki Activity

porting Blender-Benchmark for Windows ARM64 #101875

Open
Mohammad-Aamir-Afroz wants to merge 1 commits from Mohammad-Aamir-Afroz/blender-open-data:main into main
pull from: Mohammad-Aamir-Afroz/blender-open-data:main
merge into: infrastructure:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 2 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 354acdaf8a - Show all commits

4
launcher/Makefile
View File

@ -155,14 +155,14 @@ $(CLI_EXE_FILE)-arm64: $(DEPENDENCIES_CLI)
$(CLI_EXE_FILE): $(CLI_EXE_FILE)-amd64 $(CLI_EXE_FILE)-arm64 $(CLI_EXE_FILE): $(CLI_EXE_FILE)-amd64 $(CLI_EXE_FILE)-arm64
lipo -create -output $(@) $(CLI_EXE_FILE)-amd64 $(CLI_EXE_FILE)-arm64 lipo -create -output $(@) $(CLI_EXE_FILE)-amd64 $(CLI_EXE_FILE)-arm64
else else
ARCH := $(shell go env GOARCH)
.PHONY: $(GUI_EXE_FILE) .PHONY: $(GUI_EXE_FILE)
$(GUI_EXE_FILE): freetype2 assets $(DEPENDENCIES_GUI) $(GUI_EXE_FILE): freetype2 assets $(DEPENDENCIES_GUI)
$(eval ARCH := amd64)
$(call run-build-gui) $(call run-build-gui)
.PHONY: $(CLI_EXE_FILE) .PHONY: $(CLI_EXE_FILE)
$(CLI_EXE_FILE): $(DEPENDENCIES_CLI) $(CLI_EXE_FILE): $(DEPENDENCIES_CLI)
$(eval ARCH := amd64)
$(call run-build-cli) $(call run-build-cli)
endif endif

6
launcher/freetype2/Makefile
View File

@ -65,7 +65,11 @@ build-amd64/bin/lib/libfreetype.a:
$(eval ARCH_NAME := amd64) $(eval ARCH_NAME := amd64)
$(call run-build) $(call run-build)
build: build-amd64/bin/lib/libfreetype.a build-arm64/bin/lib/libfreetype.a:
$(eval ARCH_NAME := arm64)
$(call run-build)
build: build-amd64/bin/lib/libfreetype.a build-arm64/bin/lib/libfreetype.a
endif endif
clean: clean: