Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2012-03-17 16:07:58 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2012-03-17 16:07:58 +0400
commit788b47b788be99dcf983078068e10709f9f93254 (patch)
tree7ab263f61d4cf3d318ae845f0ea912f9d6fc0da9 /source/blender/editors/screen/SConscript
parent02f707e9dac91d60f75ebd0ef48200cfb32c0d7d (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/screen/SConscript')
-rw-r--r--source/blender/editors/screen/SConscript3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index ade26a0b80f..eb8f342a49d 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -17,4 +17,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_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] )