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/blenkernel | |
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/blenkernel')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index d777db7e0e7..ce282e90ac1 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -386,6 +386,10 @@ if(WITH_FFTW3) add_definitions(-DFFTW3=1) endif() +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + ## Warnings as errors, this is too strict! #if(MSVC) # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index d949f0c73db..684c3d8683b 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -108,6 +108,9 @@ if env['WITH_BF_FFTW3']: defs.append('FFTW3=1') incs += ' ' + env['BF_FFTW3_INC'] +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |