diff options
-rw-r--r-- | GNUmakefile | 11 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 6 | ||||
-rwxr-xr-x | build_files/utils/make_update.py | 8 |
3 files changed, 20 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 532f9cb9bde..98463891407 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -183,8 +183,13 @@ endif ifndef DEPS_INSTALL_DIR DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE) - ifneq ($(OS_NCASE),darwin) - # Add processor type to directory name + # Add processor type to directory name, except for darwin x86_64 + # which by convention does not have it. + ifeq ($(OS_NCASE),darwin) + ifneq ($(CPU),x86_64) + DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU) + endif + else DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU) endif endif @@ -198,7 +203,7 @@ endif # in libraries, or python 2 for running make update to get it. ifeq ($(OS_NCASE),darwin) ifeq (, $(shell command -v $(PYTHON))) - PYTHON:=../lib/darwin/python/bin/python3.7m + PYTHON:=$(DEPS_INSTALL_DIR)/python/bin/python3.7m ifeq (, $(shell command -v $(PYTHON))) PYTHON:=python endif diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 09a9a6052d2..8a7792bd886 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -72,7 +72,11 @@ if(WITH_JACK) endif() if(NOT DEFINED LIBDIR) - set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin) + if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64") + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin) + else() + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin_${CMAKE_OSX_ARCHITECTURES}) + endif() else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 53f6b3d447f..2b8c7af98fb 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -8,6 +8,7 @@ import argparse import os +import platform import shutil import sys @@ -49,7 +50,12 @@ def svn_update(args, release_version): # Checkout precompiled libraries if sys.platform == 'darwin': - lib_platform = "darwin" + if platform.machine() == 'x86_64': + lib_platform = "darwin" + elif platform.machine() == 'arm64': + lib_platform = "darwin_arm64" + else: + lib_platform = None elif sys.platform == 'win32': # Windows checkout is usually handled by bat scripts since python3 to run # this script is bundled as part of the precompiled libraries. However it |