diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-05-02 21:48:06 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-05-02 21:48:06 +0400 |
| commit | 0aaa02e6b585e71f8a4ea9dfd9f37bc6ab1725b9 (patch) | |
| tree | af70f75aa6db5bd0cb9ba4039b793bd8d496c0b6 | |
| parent | 723b84c79c91abc804380d921c91d850ab68ff0a (diff) | |
First whack at getting FREETYPE2 stuff added to the
old and autoconf makefiles. My machine seems to have messed up libs
so I can't test it, its a start though :)
Kent
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/Makefile | 4 | ||||
| -rw-r--r-- | source/nan_link.mk | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 08202dff9cc..eeaa4c57463 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -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 diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index ccca2fccf11..626f30d9201 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -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/ diff --git a/source/nan_link.mk b/source/nan_link.mk index 1006bf6d9dd..d23de1de998 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -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) |