diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-07-13 04:57:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-13 04:57:19 +0400 |
| commit | bfe11037b5d8bedb7a5185dea2eee00584254d69 (patch) | |
| tree | 847fa3aab006df47ef98a4b384619b929fc01417 | |
| parent | ded8ba1d90dade45665b7009f664ea75f2bbfd96 (diff) | |
move nan mk files from source/ into build_files/make/
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | build_files/make/nan_compile.mk (renamed from source/nan_compile.mk) | 0 | ||||
| -rw-r--r-- | build_files/make/nan_definitions.mk (renamed from source/nan_definitions.mk) | 2 | ||||
| -rw-r--r-- | build_files/make/nan_link.mk (renamed from source/nan_link.mk) | 0 | ||||
| -rw-r--r-- | build_files/make/nan_subdirs.mk (renamed from source/nan_subdirs.mk) | 0 | ||||
| -rw-r--r-- | build_files/make/nan_warn.mk (renamed from source/nan_warn.mk) | 0 |
6 files changed, 3 insertions, 3 deletions
@@ -41,7 +41,7 @@ sinclude user-def.mk # export NAN_NO_OPENAL=true export NANBLENDERHOME=$(shell pwd) -MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory +MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory SOURCEDIR = ifeq ($(FREE_WINDOWS),true) @@ -50,7 +50,7 @@ else DIRS ?= extern intern source po endif -include source/nan_subdirs.mk +include build_files/make/nan_subdirs.mk .PHONY: release release: diff --git a/source/nan_compile.mk b/build_files/make/nan_compile.mk index 36c315a8e11..36c315a8e11 100644 --- a/source/nan_compile.mk +++ b/build_files/make/nan_compile.mk diff --git a/source/nan_definitions.mk b/build_files/make/nan_definitions.mk index 37df7b05467..d14bdb0a13c 100644 --- a/source/nan_definitions.mk +++ b/build_files/make/nan_definitions.mk @@ -31,7 +31,7 @@ # set some defaults when these are not overruled (?=) by environment variables # -sinclude ../user-def.mk +sinclude ../../user-def.mk # This warning only takes place once in source/ ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) diff --git a/source/nan_link.mk b/build_files/make/nan_link.mk index bbf4053b14c..bbf4053b14c 100644 --- a/source/nan_link.mk +++ b/build_files/make/nan_link.mk diff --git a/source/nan_subdirs.mk b/build_files/make/nan_subdirs.mk index 58200a28b67..58200a28b67 100644 --- a/source/nan_subdirs.mk +++ b/build_files/make/nan_subdirs.mk diff --git a/source/nan_warn.mk b/build_files/make/nan_warn.mk index c195fb333ab..c195fb333ab 100644 --- a/source/nan_warn.mk +++ b/build_files/make/nan_warn.mk |