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/modifiers | |
| 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/modifiers')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/modifiers/SConscript | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 96a8a4216d4..90ae423f8a3 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -30,6 +30,7 @@ set(INC ../blenkernel ../blenkernel/intern ../blenlib + ../blenfont ../blenloader ../makesdna ../makesrna @@ -139,6 +140,10 @@ if(WITH_GAMEENGINE) ) endif() +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 4ab3874d6fe..2b506cce2cf 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include' incs += ' ../render/extern/include ../blenloader ../bmesh' -incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel ../blenkernel/intern' +incs += ' ../include ../blenlib ../blenfont ../makesdna ../makesrna ../blenkernel ../blenkernel/intern' incs += ' ../gpu' incs += ' ' + env['BF_ZLIB_INC'] @@ -33,6 +33,9 @@ if env['WITH_BF_GAMEENGINE']: incs += ' #/extern/recastnavigation' defs.append('WITH_GAMEENGINE') +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, libtype=['core','player'], priority = [80, 40] ) |