diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-31 20:04:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-12 00:30:31 +0300 |
| commit | 6b3d85fa51f376b282dfa2fd648dab2c902c554b (patch) | |
| tree | 7181278a7223364a52a8ee1701426fee79eb8a9e /GNUmakefile | |
| parent | 610459658777e73e50671ddbcebd70294a6ad76e (diff) | |
Build: auto detection of libraries built by "make deps" on Linux.
Use the libraries if they exist in ../lib/linux_x86_64 or similar, so
that you can run "make deps && make full" to get a full static build.
Note that install_deps.sh is still the only officially supported way to
build Blender dependencies on Linux, but this may be useful to some.
Differential Revision: https://developer.blender.org/D2980
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile index 1143ac6e1f1..46f0fa18eec 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,6 +48,11 @@ DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment DEPS_BUILD_DIR:=$(BUILD_DIR)/deps DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE) +ifneq ($(OS_NCASE),darwin) + # Add processor type to directory name + DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p) +endif + # Allow to use alternative binary (pypy3, etc) ifndef PYTHON PYTHON:=python3 |