Diego Borghetti
405cf80eb8
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)
23 lines
647 B
Python
23 lines
647 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
|
|
cflags=''
|
|
incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include'
|
|
incs += ' ' + env['BF_FREETYPE_INC']
|
|
incs += ' ' + env['BF_ZLIB_INC']
|
|
defs = ''
|
|
|
|
if env['WITH_BF_SDL']:
|
|
incs += ' ' + env['BF_SDL_INC']
|
|
|
|
if env['OURPLATFORM'] == 'linux2':
|
|
cflags='-pthread'
|
|
incs += ' ../../../extern/binreloc/include'
|
|
|
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
|
|
incs += ' ' + env['BF_PTHREADS_INC']
|
|
|
|
env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core'], priority = [180], compileflags =cflags )
|