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 /config | |
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 'config')
-rw-r--r-- | config/darwin-config.py | 5 | ||||
-rw-r--r-- | config/irix6-config.py | 5 | ||||
-rw-r--r-- | config/linux2-config.py | 5 | ||||
-rw-r--r-- | config/linuxcross-config.py | 5 | ||||
-rw-r--r-- | config/openbsd3-config.py | 5 | ||||
-rw-r--r-- | config/sunos5-config.py | 5 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 5 | ||||
-rw-r--r-- | config/win32-vc-config.py | 5 | ||||
-rw-r--r-- | config/win64-vc-config.py | 5 |
9 files changed, 0 insertions, 45 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 8ac83ce4a0d..78a8c71b7dd 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -138,11 +138,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=True WITH_BF_PLAYER=True diff --git a/config/irix6-config.py b/config/irix6-config.py index 711d16e623c..1ef271b5074 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -77,11 +77,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextpo intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE='false' WITH_BF_ODE = 'false' diff --git a/config/linux2-config.py b/config/linux2-config.py index d7c09258152..eb93d8084f1 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -71,11 +71,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 4214ca52aac..4b17224eacc 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -74,11 +74,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = False WITH_BF_ODE = True diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 3a36f8df663..6a7518a7928 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -59,11 +59,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl iconv' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 6fa9529e1cd..25f200fe346 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -67,11 +67,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = '#extern/bFTGL' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE=False WITH_BF_ODE = False diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 80082002b21..a579d21a544 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -75,11 +75,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = False WITH_BF_ODE = True diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index b5ad19890e1..b94a9c4effe 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -87,11 +87,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = True -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = True WITH_BF_PLAYER = True diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 62440baae56..945efecdc3c 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -90,11 +90,6 @@ BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = False -BF_FTGL = LIBDIR + '/ftgl' -BF_FTGL_INC = '${BF_FTGL}/include' -BF_FTGL_LIB = 'extern_ftgl' - WITH_BF_GAMEENGINE = True WITH_BF_PLAYER = False |