archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

First whack at getting FREETYPE2 stuff added to the

Browse Source 
old and autoconf makefiles.  My machine seems to have messed up libs
so I can't test it, its a start though :)

Kent
This commit is contained in:
Kent Mein
2003-05-02 17:48:06 +00:00
parent 723b84c79c
commit 0aaa02e6b5
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/Makefile
View File

@@ -58,6 +58,8 @@ CPPFLAGS += -I../../bpython/include
CPPFLAGS += -I../../avi CPPFLAGS += -I../../avi
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
# we still refer to /include a bit... # we still refer to /include a bit...
CPPFLAGS += -I../../include CPPFLAGS += -I../../include

4
source/blender/blenlib/intern/Makefile
View File

@@ -48,4 +48,6 @@ CPPFLAGS += -I../../makesdna
CPPFLAGS += -I.. CPPFLAGS += -I..
# path to the guarded memory allocator # path to the guarded memory allocator
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
# path to freetype font stuff
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
CPPFLAGS += -I../../include/

5
source/nan_link.mk
View File

@@ -37,6 +37,11 @@ ifdef NAN_DEBUG
LDFLAGS += $(NAN_DEBUG) LDFLAGS += $(NAN_DEBUG)
endif endif
ifdef WITH_FREETYPE2
LDFLAGS += -L$(NAN_FREETYPE)/lib -lfreetype
endif
DBG_LDFLAGS += -g DBG_LDFLAGS += -g
ifneq (x$(DEBUG_DIR), x) ifneq (x$(DEBUG_DIR), x)