diff options
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile index 6f5b3640df0..58f998f66a0 100644 --- a/source/Makefile +++ b/source/Makefile @@ -36,7 +36,6 @@ ifndef NANENV export NANENV := $(shell env | grep NAN_) endif -sinclude ../user-def.mk include nan_definitions.mk DIRS = creator blender kernel diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 63ea38296d2..83eb5c27abc 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -32,6 +32,8 @@ # set some defaults when these are not overruled (?=) by environment variables # +sinclude ../user-def.mk + ifndef CONFIG_GUESS ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) ifeq (all, $(findstring all, $(MAKECMDGOALS))) |