diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
| commit | 405cf80eb8dc2df8ae160aee70aef34052add24a (patch) | |
| tree | f03cc27e95bdf91b25ea9d2a0dffb28ccef666be /intern/ghost/test | |
| parent | 71c38978e14ebf3522fe60fc239ad04f10ef30ab (diff) | |
Big, big commit!!
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
the old BMF api.
I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.
MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
Always have to link/include the freetype2 library
Remove any reference to libbmfont
Remove any reference to libftfont
Remove any reference to libbftgl (or libbFTGL)
Diffstat (limited to 'intern/ghost/test')
| -rw-r--r-- | intern/ghost/test/multitest/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/ghost/test/multitest/Makefile b/intern/ghost/test/multitest/Makefile index e67faf012d2..1ecbcd98e2b 100644 --- a/intern/ghost/test/multitest/Makefile +++ b/intern/ghost/test/multitest/Makefile @@ -41,7 +41,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../.. @@ -49,7 +48,6 @@ OCGGHOST = $(OCGDIR)/intern/ghost LIBS = $(OCGGHOST)/$(DEBUG_DIR)libghost.a SLIBS += $(LCGDIR)/string/lib/libstring.a -SLIBS += $(LCGDIR)/bmfont/lib/libbmfont.a SLIBS += $(LCGDIR)/guardedalloc/lib/libguardedalloc.a all:: |