First whack at getting FREETYPE2 stuff added to the
authorKent Mein <mein@cs.umn.edu>
Fri, 2 May 2003 17:48:06 +0000 (17:48 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 2 May 2003 17:48:06 +0000 (17:48 +0000)
old and autoconf makefiles.  My machine seems to have messed up libs
so I can't test it, its a start though :)

Kent

source/blender/blenkernel/intern/Makefile
source/blender/blenlib/intern/Makefile
source/nan_link.mk

index 08202dff9ccb3d52e5f419e0c4acb31e8e6f1a30..eeaa4c574639e7eb13c1bead62dd25e2b8e233c5 100644 (file)
@@ -58,6 +58,8 @@ CPPFLAGS += -I../../bpython/include
 CPPFLAGS += -I../../avi
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
+CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
+
 # we still refer to /include a bit...
 CPPFLAGS += -I../../include
 
index ccca2fccf11547c219a8bb73c3475794b1dae088..626f30d9201c2924ceb517f6f6189b5822b3a583 100644 (file)
@@ -48,4 +48,6 @@ CPPFLAGS += -I../../makesdna
 CPPFLAGS += -I..
 # path to the guarded memory allocator
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
-
+# path to freetype font stuff
+CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
+CPPFLAGS += -I../../include/
index 1006bf6d9ddb2e16087c5bb8e726308bffd53b23..d23de1de998685f049a868fdd06a6b4511f0be57 100644 (file)
@@ -37,6 +37,11 @@ ifdef NAN_DEBUG
     LDFLAGS += $(NAN_DEBUG)
 endif
 
+ifdef WITH_FREETYPE2
+   LDFLAGS += -L$(NAN_FREETYPE)/lib -lfreetype
+endif
+
+
 DBG_LDFLAGS    += -g
 
 ifneq (x$(DEBUG_DIR), x)