diff options
author | Kent Mein <mein@cs.umn.edu> | 2005-02-18 19:52:03 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2005-02-18 19:52:03 +0300 |
commit | 8c4608bbf4955033f2a34072ff55651db1520f74 (patch) | |
tree | d15f9a642faf8b6b09b6a074ce8308442dc62d4e /source | |
parent | f24c823f779928ad0fd178401255173ad86e0e77 (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')
-rw-r--r-- | source/blender/blenkernel/intern/Makefile | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/Makefile | 2 | ||||
-rw-r--r-- | source/nan_compile.mk | 16 |
3 files changed, 9 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index a61efdd4405..4468fa01f12 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -72,7 +72,7 @@ CPPFLAGS += -I$(NAN_IKSOLVER)/include # path to our own external headerfiles CPPFLAGS += -I.. -ifdef WITH_FREETYPE2 +ifeq ($(WITH_FREETYPE2), true) CPPFLAGS += -DWITH_FREETYPE2 CPPFLAGS += -I$(NAN_FREETYPE)/include CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index 602876d6f5e..18be55db7b6 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -55,6 +55,6 @@ CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 CPPFLAGS += -I$(SRCHOME)/blender/blenkernel CPPFLAGS += -I../../include/ -ifdef WITH_FREETYPE2 +ifeq ($(WITH_FREETYPE2), true) CPPFLAGS += -DWITH_FREETYPE2 endif 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 |