[Bf-blender-cvs] [8f51308dba0] blender2.8: Build: allow overriding DEPS_BUILD_DIR and DEPS_INSTALL_DIR for make deps.
Brecht Van Lommel
noreply at git.blender.org
Mon Sep 24 15:49:28 CEST 2018
Commit: 8f51308dba0a5dc2f70c273e2de9fb7d102ed2f9
Author: Brecht Van Lommel
Date: Mon Sep 24 14:50:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8f51308dba0a5dc2f70c273e2de9fb7d102ed2f9
Build: allow overriding DEPS_BUILD_DIR and DEPS_INSTALL_DIR for make deps.
===================================================================
M GNUmakefile
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index c0ed52d6035..21183220b80 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -45,12 +45,18 @@ endif
# Dependencies DIR's
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)
+ifndef DEPS_BUILD_DIR
+ DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
+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
+ DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
+ endif
endif
# Allow to use alternative binary (pypy3, etc)
More information about the Bf-blender-cvs
mailing list