[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44939] trunk/blender: 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!).
Bastien Montagne
montagne29 at wanadoo.fr
Sat Mar 17 13:08:08 CET 2012
Revision: 44939
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44939
Author: mont29
Date: 2012-03-17 12:07:58 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
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 ;) ).
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44924
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/SConscript
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/SConscript
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/SConscript
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/SConscript
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -382,7 +382,7 @@
message(WARNING "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
"This is an 'svn external', which are known not to work with bridges to other version "
"control systems: * CONTINUING WITHOUT ADDONS *")
- set(WITH_INTERNATIONAL OFF)
+ set(WITH_PYTHON OFF)
endif()
endif()
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -386,6 +386,10 @@
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")
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/blenkernel/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -108,6 +108,9 @@
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']
Modified: trunk/blender/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/animation/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/animation/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -54,4 +54,8 @@
anim_intern.h
)
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/animation/SConscript
===================================================================
--- trunk/blender/source/blender/editors/animation/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/animation/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -6,4 +6,9 @@
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
-env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] )
+defs = []
+
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), defs, libtype=['core'], priority=[125] )
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -55,4 +55,8 @@
reeb.h
)
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/armature/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -8,6 +8,8 @@
incs += ' ../../render/extern/include ../../bmesh'
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
+defs = []
+
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
@@ -15,4 +17,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
-env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[44] )
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), defs, libtype=['core'], priority=[44] )
Modified: trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/gpencil/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -47,4 +47,8 @@
gpencil_intern.h
)
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/gpencil/SConscript
===================================================================
--- trunk/blender/source/blender/editors/gpencil/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/gpencil/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -8,4 +8,9 @@
incs += ' ../../gpu ../../blenloader ../../bmesh ../../blenfont'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
-env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] )
+defs = []
+
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), defs, libtype=['core'], priority=[45] )
Modified: trunk/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/screen/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/screen/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -47,4 +47,8 @@
screen_intern.h
)
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/screen/SConscript
===================================================================
--- trunk/blender/source/blender/editors/screen/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/screen/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -17,4 +17,7 @@
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] )
Modified: trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -44,4 +44,8 @@
buttons_intern.h
)
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/space_buttons/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/space_buttons/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -9,4 +9,7 @@
defs = []
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), defs, libtype=['core'], priority=[120] )
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -78,4 +78,8 @@
add_definitions(-DWITH_HDR)
endif()
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/space_file/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_file/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/space_file/SConscript 2012-03-17 12:07:58 UTC (rev 44939)
@@ -19,11 +19,14 @@
if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF')
+if env['WITH_BF_INTERNATIONAL']:
+ defs.append('WITH_INTERNATIONAL')
+
if env['OURPLATFORM'] == 'linux':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
-
+
env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), defs, libtype=['core'], priority=[115] )
Modified: trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2012-03-17 10:46:02 UTC (rev 44938)
+++ trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2012-03-17 12:07:58 UTC (rev 44939)
@@ -53,4 +53,8 @@
add_definitions(-DWITH_AUDASPACE)
endif()
+if(WITH_INTERNATIONAL)
+ add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/space_graph/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_graph/SConscript 2012-03-17 10:46:02 UTC (rev 44938)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list