diff options
| author | Chris Want <cwant@ualberta.ca> | 2009-03-19 04:50:45 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2009-03-19 04:50:45 +0300 |
| commit | 77e0199dc386c26aa106a884f24b336fce82d351 (patch) | |
| tree | 1e7d355e193947d3b52b4ab7ea2327953efdb05b /source/nan_definitions.mk | |
| parent | 3aab50f775e4928d3ee525a999e2b4c995ae9ae4 (diff) | |
Makefile updates for Blender 2.5 (from GSR)
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 9ca458e8371..60fc56408b2 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -1,3 +1,5 @@ +# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# vim: tabstop=8 # # $Id$ # @@ -22,7 +24,7 @@ # # The Original Code is: all of this file. # -# Contributor(s): none yet. +# Contributor(s): GSR # # ***** END GPL LICENSE BLOCK ***** # @@ -31,14 +33,25 @@ sinclude ../user-def.mk +# This warning only takes place once in source/ +ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) + ifeq (all, $(findstring all, $(MAKECMDGOALS))) + export ERRTXT = "ERROR: all and debug targets cannot be used together anymore" + export ERRTXT += "Use something like ..make all && make debug.. instead" + endif +endif + +ifdef ERRTXT +$(error $(ERRTXT)) +endif + ifndef CONFIG_GUESS ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) - ifeq (all, $(findstring all, $(MAKECMDGOALS))) -all debug:: - ERRTXT = "ERROR: all and debug targets cannot be used together anymore" - ERRTXT += "Use something like ..make all && make debug.. instead" - $(error $(ERRTXT)) - endif + export DEBUG_DIR = debug/ + export ALL_OR_DEBUG = debug + endif + ifeq (all, $(findstring all, $(MAKECMDGOALS))) + export ALL_OR_DEBUG ?= all endif # First generic defaults for all platforms which should be constant. @@ -158,9 +171,9 @@ endif endif endif endif - ifeq ($(WITH_OPENEXR), true) - export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR - endif + ifeq ($(WITH_OPENEXR), true) + export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR + endif endif # Platform Dependent settings go below: |