diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-03-17 16:07:58 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-03-17 16:07:58 +0400 |
| commit | 788b47b788be99dcf983078068e10709f9f93254 (patch) | |
| tree | 7ab263f61d4cf3d318ae845f0ea912f9d6fc0da9 /source/blender/editors/space_node/SConscript | |
| parent | 02f707e9dac91d60f75ebd0ef48200cfb32c0d7d (diff) | |
Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!).
Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).
Diffstat (limited to 'source/blender/editors/space_node/SConscript')
| -rw-r--r-- | source/blender/editors/space_node/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index ec4ed971a76..58fae203cf5 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -14,7 +14,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['CC'] == 'gcc': #cf.append('-Werror') pass - + if env['OURPLATFORM'] == 'linux': cflags='-pthread' incs += ' ../../../extern/binreloc/include' @@ -22,4 +22,7 @@ if env['OURPLATFORM'] == 'linux': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + env.BlenderLib ( 'bf_editors_space_node', sources, Split(incs), defs, libtype=['core'], priority=[55], compileflags=cf ) |