diff options
| -rw-r--r-- | extern/SConscript | 6 | ||||
| -rw-r--r-- | source/blender/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/src/SConscript | 2 | ||||
| -rw-r--r-- | tools/Blender.py | 15 | ||||
| -rwxr-xr-x | tools/btools.py | 9 |
8 files changed, 21 insertions, 19 deletions
diff --git a/extern/SConscript b/extern/SConscript index 15cace23c6c..4228c50ce7c 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -3,8 +3,8 @@ Import('env') SConscript(['qhull/SConscript', - 'solid/SConscript', - 'bullet/SConscript']) + 'solid/SConscript', + 'bullet/SConscript']) -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL']: SConscript(['bFTGL/SConscript']) diff --git a/source/blender/SConscript b/source/blender/SConscript index ba821355e23..d5e570583c8 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -16,7 +16,7 @@ SConscript(['avi/SConscript', 'src/SConscript', 'yafray/SConscript']) -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL'] == 1: SConscript (['ftfont/SConscript']) if env['WITH_BF_OPENEXR'] == 1: diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index df709db5a0b..aaee2409d89 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -14,7 +14,7 @@ incs += ' ' + env['BF_SDL_INC'] defs = '' -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL'] == 1: defs += 'WITH_FREETYPE2' if env['WITH_BF_OPENEXR'] == 1: diff --git a/source/blender/blenkernel/bad_level_call_stubs/SConscript b/source/blender/blenkernel/bad_level_call_stubs/SConscript index 278c74a38f6..cfe53fd8ab4 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/SConscript +++ b/source/blender/blenkernel/bad_level_call_stubs/SConscript @@ -8,7 +8,7 @@ incs += ' #/intern/iksolver/extern ../../blenlib' incs += ' ../../include ../../makesdna' defs = '' -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL']: defs += 'WITH_FREETYPE2' env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player2',priority=0 ) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 99c48c74fb2..8b9d0bcbf1b 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -9,7 +9,7 @@ incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_SDL_INC'] defs = '' -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL'] == 1: defs = 'WITH_FREETYPE2' env.BlenderLib ( 'blender_blenlib', sources, Split(incs), Split(defs), libtype='core', priority = 85 ) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 5f746ae6566..5f5f86ee573 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -19,7 +19,7 @@ incs += ' ' + env['BF_OPENGL_INC'] defs = [] -if env['WITH_BF_FREETYPE'] == 1: +if env['WITH_BF_INTERNATIONAL'] == 1: incs += ' ../ftfont' defs.append('INTERNATIONAL') defs.append('FTGL_STATIC_LIBRARY') diff --git a/tools/Blender.py b/tools/Blender.py index bdaf3936ee4..a2bc4032f08 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -114,16 +114,16 @@ def setup_staticlibs(lenv): lenv['BF_JPEG_LIBPATH'], lenv['BF_TIFF_LIBPATH'], lenv['BF_PNG_LIBPATH'], - lenv['BF_GETTEXT_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], - lenv['BF_FREETYPE_LIBPATH'], -# lenv['BF_QUICKTIME_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_INTERNATIONAL']: + libincs += Split(lenv['BF_GETTEXT_LIBPATH']) + libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_OPENAL']: - lenv['BF_OPENAL_LIBPATH'] + libincs += Split(lenv['BF_OPENAL_LIBPATH']) return statlibs, libincs @@ -132,10 +132,11 @@ def setup_syslibs(lenv): lenv['BF_PYTHON_LIB'], lenv['BF_JPEG_LIB'], lenv['BF_PNG_LIB'], - lenv['BF_ZLIB_LIB'], - lenv['BF_FREETYPE_LIB'], - lenv['BF_GETTEXT_LIB'] + lenv['BF_ZLIB_LIB'] ] + if lenv['WITH_BF_INTERNATIONAL']: + syslibs += Split(lenv['BF_FREETYPE_LIB']) + syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: syslibs += Split(lenv['BF_OPENAL_LIB']) if lenv['OURPLATFORM']=='win32vc': diff --git a/tools/btools.py b/tools/btools.py index ee6dfbf54f3..6cceb1d3e22 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -24,12 +24,13 @@ def validate_arguments(args, bc): 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', - 'WITH_BF_GETTEXT', 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH', + 'WITH_BF_INTERNATIONAL', + 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH', 'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH', 'WITH_BF_ODE', 'BF_ODE', 'BF_ODE_INC', 'BF_ODE_LIB', 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB', 'BF_SOLID', 'BF_SOLID_INC', - 'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', + 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', 'WITH_BF_OPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS', 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', @@ -159,7 +160,8 @@ def read_opts(cfg, args): ('BF_ZLIB_LIB', 'ZLib library', ''), ('BF_ZLIB_LIBPATH', 'ZLib library path', ''), - (BoolOption('WITH_BF_GETTEXT', 'Use gettext if true', 'true')), + (BoolOption('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', 'true')), + ('BF_GETTEXT', 'gettext base path', ''), ('BF_GETTEXT_INC', 'gettext include path', ''), ('BF_GETTEXT_LIB', 'gettext library', ''), @@ -203,7 +205,6 @@ def read_opts(cfg, args): ##BF_PARANOID = 'true' ## ### enable freetype2 support for text objects - (BoolOption('WITH_BF_FREETYPE', 'Use Freetype if true', 'true')), ('BF_FREETYPE', 'Freetype base path', ''), ('BF_FREETYPE_INC', 'Freetype include path', ''), ('BF_FREETYPE_LIB', 'Freetype library', ''), |