I updated the FREETYPE2 checks so it didn't build freetype stuff
authorKent Mein <mein@cs.umn.edu>
Fri, 18 Feb 2005 16:52:03 +0000 (16:52 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 18 Feb 2005 16:52:03 +0000 (16:52 +0000)
if WITH_FREETYPE2 was set to false.

Also added/cleaned up source/nan_compile.mk NAN_NOKETSJI stuff a hair.

Kent

extern/Makefile
source/blender/blenkernel/intern/Makefile
source/blender/blenlib/intern/Makefile
source/nan_compile.mk

index 458d19f357baff797dbca12772ea8930a3e54fbb..e872213f4cdac4408a2f7d824622997016272ae5 100644 (file)
@@ -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)
index a61efdd44057604f64e4b72e1d619a9979290bcd..4468fa01f1265c20da81f325c33e320b6f67a965 100644 (file)
@@ -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
index 602876d6f5e7e369618cc5c51cb5d6afe7432293..18be55db7b61a98d9da74de300fad07ae3cf0cc2 100644 (file)
@@ -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
index 5ff205842849abace278d84d611f943b3749c7c6..2e3d9ae245cc9886c26de633b2104eaf1c5fc50e 100644 (file)
@@ -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