Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>2003-01-07 08:08:10 +0300
committerWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>2003-01-07 08:08:10 +0300
commitade767d2afad85b94780b200703487ed822f9972 (patch)
treed19e8a0c7e76def70fd7eb2d82ca134674385972 /source
parent3531f874e0a4168d15f5d321a85f86ba3a37bfac (diff)
Linux now also uses ode from lib/
Diffstat (limited to 'source')
-rw-r--r--source/Makefile2
-rw-r--r--source/nan_definitions.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/source/Makefile b/source/Makefile
index da0767afa7b..3a24c6cb37a 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -39,7 +39,7 @@ endif
include nan_definitions.mk
DIRS = creator blender kernel gameengine
-ifneq ($(OS),$(findstring $(OS), "darwin freebsd irix"))
+ifneq ($(OS),$(findstring $(OS), "darwin freebsd irix linux"))
DIRS += ode
endif
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 1154878ed36..eab31f78ee1 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -158,6 +158,7 @@ all debug::
ifeq ($(OS),linux)
export ID = $(shell whoami)
export HOST = $(shell hostname -s)
+ export NAN_ODE = $(LCGDIR)/ode
endif
ifeq ($(OS),openbsd)