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 /source/Makefile | |
| 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 'source/Makefile')
| -rw-r--r-- | source/Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source/Makefile b/source/Makefile index 1173756cbcb..85486c3a81f 100644 --- a/source/Makefile +++ b/source/Makefile @@ -158,7 +158,6 @@ endif COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a -COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a @@ -184,22 +183,17 @@ ifeq ($(WITH_BINRELOC), true) COMLIB += $(OCGDIR)/extern/binreloc/$(DEBUG_DIR)libbinreloc.a endif -ifeq ($(WITH_FREETYPE2), true) - ifeq ($(OS), windows) - ifeq ($(FREE_WINDOWS), true) - COMLIB += $(NAN_FTGL)/lib/libftgl.a +ifeq ($(OS), windows) + ifeq ($(FREE_WINDOWS), true) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib + else COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib - endif + endif +else + ifeq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else - COMLIB += $(NAN_FTGL)/lib/$(DEBUG_DIR)libftgl.a - ifeq ($(OS), irix) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - endif endif endif |