diff options
author | Stefan Gartner <stefang@aon.at> | 2003-05-10 20:35:28 +0400 |
---|---|---|
committer | Stefan Gartner <stefang@aon.at> | 2003-05-10 20:35:28 +0400 |
commit | b3c48c4d2ca2f8871fcd2612f8614bfd18cf3c40 (patch) | |
tree | ef15f101bb1e3ccd1c560af380d7664043a5389b /source/blender/blenlib | |
parent | 1ecddea4624856ff694fdeee9c643b2df54c536f (diff) |
enable truetype fonts for text objects when building with the original
Makefiles. Platform manages should check nan_definitions.mk and set
INTERNATIONAL to true for their platforms.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_vfontdata.h | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/Makefile | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h index b6ec749b50a..6485a0aa48e 100644 --- a/source/blender/blenlib/BLI_vfontdata.h +++ b/source/blender/blenlib/BLI_vfontdata.h @@ -63,7 +63,6 @@ typedef struct VFontData { BLI_vfontdata_from_psfont( struct PackedFile *pf); -#ifdef WITH_FREETYPE2 /** * Construct a new VFontData structure from * Freetype font data in a PackedFile. @@ -77,5 +76,3 @@ BLI_vfontdata_from_freetypefont( struct PackedFile *pf); #endif -#endif - diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index 626f30d9201..9067b98d270 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -49,5 +49,10 @@ CPPFLAGS += -I.. # path to the guarded memory allocator CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # path to freetype font stuff +CPPFLAGS += -I$(NAN_FREETYPE)/include CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 CPPFLAGS += -I../../include/ + +ifdef WITH_FREETYPE2 + CPPFLAGS += -DWITH_FREETYPE2 +endif |