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
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2005-02-18 19:52:03 +0300
committerKent Mein <mein@cs.umn.edu>2005-02-18 19:52:03 +0300
commit8c4608bbf4955033f2a34072ff55651db1520f74 (patch)
treed15f9a642faf8b6b09b6a074ce8308442dc62d4e /source/nan_compile.mk
parentf24c823f779928ad0fd178401255173ad86e0e77 (diff)
I updated the FREETYPE2 checks so it didn't build freetype stuff
if WITH_FREETYPE2 was set to false. Also added/cleaned up source/nan_compile.mk NAN_NOKETSJI stuff a hair. Kent
Diffstat (limited to 'source/nan_compile.mk')
-rw-r--r--source/nan_compile.mk16
1 files changed, 7 insertions, 9 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index 5ff20584284..2e3d9ae245c 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -38,9 +38,13 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
# common parts ---------------------------------------------------
# Uncomment next lines to enable integrated game engine
-CFLAGS += -DGAMEBLENDER=1
-CFLAGS += -DUSE_SUMO_SOLID
-CCFLAGS += -DUSE_SUMO_SOLID
+ifneq ($(NAN_NO_KETSJI), true)
+ CFLAGS += -DGAMEBLENDER=1
+ CFLAGS += -DUSE_SUMO_SOLID
+ CCFLAGS += -DUSE_SUMO_SOLID
+else
+ CPPFLAGS += -DNO_KETSJI
+endif
ifdef NAN_DEBUG
CFLAGS += $(NAN_DEBUG)
@@ -52,12 +56,6 @@ REL_CCFLAGS += -DNDEBUG
DBG_CFLAGS += -g
DBG_CCFLAGS += -g
-# Is the game engine getting you down? ---------------------------------
-
-ifeq ($(NAN_NO_KETSJI), true)
- CPPFLAGS += -DNO_KETSJI
-endif
-
# Support for new transform code ---------------------------------------
ifeq ($(NAN_NEW_TRANSFORM), true)
CPPFLAGS += -DNEWTRANSFORM