diff options
| -rw-r--r-- | extern/Makefile | 6 | ||||
| -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 |
4 files changed, 14 insertions, 12 deletions
diff --git a/extern/Makefile b/extern/Makefile index 458d19f357b..e872213f4cd 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -34,7 +34,11 @@ include nan_definitions.mk SOURCEDIR = extern DIR = $(OCGDIR)/extern -DIRS = qhull/src solid bFTGL/src +DIRS = qhull/src solid + +ifeq ($(WITH_FREETYPE2), true) + DIRS += bFTGL/src +endif TARGET = ifneq ($(OS),irix) 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 |