diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 15:24:52 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 15:24:52 +0300 |
| commit | 631a8d85d4a2b83394bbbb2ac629bbe2f206fa21 (patch) | |
| tree | eb271d391d0e630c0fc093eb6b5f0d1f279846e8 /source | |
| parent | c5a0e79fb02d42cdd657ddc6bb0805335df212bd (diff) | |
* WITH_BF_GETTEXT and WITH_BF_FREETYPE are merged into WITH_BF_INTERNATIONAL
* typo in adding BF_OPENAL_LIBPATH, resulting in it not being added at all
Diffstat (limited to 'source')
| -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 |
5 files changed, 5 insertions, 5 deletions
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') |