Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL...
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Mar 2012 12:07:58 +0000 (12:07 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Mar 2012 12:07:58 +0000 (12:07 +0000)
Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).

31 files changed:
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/animation/SConscript
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/armature/SConscript
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/gpencil/SConscript
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/SConscript
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_buttons/SConscript
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_file/SConscript
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_graph/SConscript
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_info/SConscript
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_nla/SConscript
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/SConscript
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/SConscript
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/transform/SConscript
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript

index 92abb54a32fc9f696e04ca1b0ef239c5dec2046e..436fe97c6777faee2dc788c53cc26fc4c1d1f2df 100644 (file)
@@ -382,7 +382,7 @@ if(WITH_PYTHON)
                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()
 
index d777db7e0e72abf9daf7faba42599c3fc9cf00a0..ce282e90ac1ee7c640d859122bc0cce70ebf0ae7 100644 (file)
@@ -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")
index d949f0c73db34dbd3236164b7ff81365b2291bdd..684c3d8683b0e53fe75551e5fe1c5fe39d3283df 100644 (file)
@@ -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']
 
index 2549358f28506242ceffbc947aef0854c15bbfa7..9e1e44e411de25f86844967949c4d3c33ec7e287 100644 (file)
@@ -54,4 +54,8 @@ set(SRC
        anim_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")
index 120000fedc48fe9d753ddeaa0a2b1edbde19a7e8..658ad2794a15eebe3fc2d44b1780167e6e0cbfc9 100644 (file)
@@ -6,4 +6,9 @@ sources = env.Glob('*.c')
 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] )
index 8c1243ee30070220df758afce159d53d8ddad9d1..2bd9956ef5a849548376d689a5013bccdac4b5c2 100644 (file)
@@ -55,4 +55,8 @@ set(SRC
        reeb.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")
index b85a13ced85987768f0eba93cc4a89d88f420cc1..e5c96d3530ff6935aad8c0edaf2bc61151984612 100644 (file)
@@ -8,6 +8,8 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 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'] == 'linux':
 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] )
index ce21d47ae48b3890edd6231e680bc785f83a1e6f..762db26bc4f189db73227035b9e405ddbb55ad7b 100644 (file)
@@ -47,4 +47,8 @@ set(SRC
        gpencil_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")
index dca419d2fb719f14e326f624f1e54823faa80fc1..9d92a238eb78ce08e388866ab538ec8e4f120ec0 100644 (file)
@@ -8,4 +8,9 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 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] )
index 79a805cfa6e204da3d676a2914cbbc76e37bbf3d..33373354aa482a737b490dc7e194fee936039d3c 100644 (file)
@@ -47,4 +47,8 @@ set(SRC
        screen_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
index ade26a0b80fb07648132a4f22bddc60d38aaa1de..eb8f342a49d51084a87220ff25fbcd991055a882 100644 (file)
@@ -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] )
index ee118f120625e923f3c42ec57ddfb6fb20d2e56b..7233d4623d1d3b21569599710388c6f9281b6975 100644 (file)
@@ -44,4 +44,8 @@ set(SRC
        buttons_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")
index 7bc588c627c14daa1f78acc793697c7ce8b56c62..92579b6dedf82789d68c1890ee251a46b7765619 100644 (file)
@@ -9,4 +9,7 @@ incs += ' ../../bmesh ../../makesrna ../../render/extern/include ../../blenloade
 
 defs = []
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
 env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), defs, libtype=['core'], priority=[120] )
index 6d959d0b7394fecd80139007805dc5442c7a2a47..98e147413ffaa21c58d9f632f3d670cb30a4864b 100644 (file)
@@ -78,4 +78,8 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")
index ad96840f7b9fc0449c46f9a64c5e8810c114dfc7..ad8bcba39d6adc0d21c05c9bedc676c03a907281 100644 (file)
@@ -19,11 +19,14 @@ if env['WITH_BF_OPENEXR']:
 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] )
index 50ab985d1e03786e171ff2674c088d79c0437a57..5b39604809ce036df7125e61c2c9f888f93670f1 100644 (file)
@@ -53,4 +53,8 @@ if(WITH_AUDASPACE)
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")
index fe8846d2c3022811987bb8486a5ecaa9bef48642..83239a5480af03d762ad54b361b6e7a1c4e81c05 100644 (file)
@@ -7,4 +7,9 @@ incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' #/intern/audaspace/intern ../../blenloader'
 
-env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] )
+defs = []
+
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), defs, libtype=['core'], priority=[50] )
index 7cf5b1fc3fb8cb229b138df0a229b31532b77628..94b40a9f40a4574c214da814cb03028ffaacd008 100644 (file)
@@ -48,4 +48,8 @@ set(SRC
        textview.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}")
index 746edadccc2888de57163eb32a5958b44f0e6d00..e4746aefa0c102cc1a75237b07f74a73bc1b95f5 100644 (file)
@@ -8,4 +8,7 @@ incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/in
 
 defs = []
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
 env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), defs, libtype=['core'], priority=[70] )
index cae31f863887c2119165433e2d004a795d7c0063..aa3598e8e1f5979c69095caa1853a474152354ae 100644 (file)
@@ -46,4 +46,8 @@ set(SRC
        nla_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}")
index 6738f3380b4d22c9f50d279c5430ad836bce641b..ee010e6856f01340bf9f80719d8332b382482058 100644 (file)
@@ -6,4 +6,9 @@ sources = env.Glob('*.c')
 incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader'
 
-env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), [], libtype=['core'], priority=[85] )
+defs = []
+
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_space_nla', sources, Split(incs), defs, libtype=['core'], priority=[85] )
index f33b784c5d2da8dc545b6705d181c81e90c18d0f..8c3397b9ddde669bc30a573c0ec213d9f38acc0a 100644 (file)
@@ -54,4 +54,8 @@ set(SRC
        node_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")
index ec4ed971a76697f4094e20dbeb01c3511d3cf5d3..58fae203cf5c6cd3ac2c19a06c5bbbdd4a5b2a8b 100644 (file)
@@ -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 )
index e78bad62ba504c76191e6f1bab2c7e3200e529ab..1bba237ed5c91fdc4affceb571dd38fe3ee8388d 100644 (file)
@@ -69,4 +69,8 @@ endif()
 
 add_definitions(-DGLEW_STATIC)
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
index 53bd7828b638043c50ecbb44b9c5662f5a0e5b94..e412927f8ca4a945d5a33411cefe3f88db737901 100644 (file)
@@ -16,4 +16,7 @@ if env['WITH_BF_GAMEENGINE']:
 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_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] )
index 984619181515497652b3c1ef59aa31d0034df7ef..05a4f6f4ce50f6d489c0a58b3148212b2b3d907b 100644 (file)
@@ -49,4 +49,8 @@ set(SRC
        transform.h
 )
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
index 0cf3875aa2edd38344d07473caa15c5033ca290b..dbf6179035cb549b5494a08851d938cfc9f1a020 100644 (file)
@@ -8,4 +8,9 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh'
 
-env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] )
+defs = []
+
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
+env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), defs, libtype=['core'], priority=[40] )
index 96a8a4216d4acbd2c6319471cccbb3086bffc938..90ae423f8a34ac2c057d58a0c5261af0c3342def 100644 (file)
@@ -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()
index 4ab3874d6fec43337bf44df6a2edcec6b924974f..2b506cce2cf3a17e97c8cae31e6884f0781aceb5 100644 (file)
@@ -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] )
index aabf13f3bb24203c56478cc57fe92c33f3f0921b..9bcbc91265c607d00494fadd2fe880d468da6e38 100644 (file)
@@ -222,6 +222,10 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
+if(WITH_INTERNATIONAL)
+       add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 if(WITH_IMAGE_OPENEXR)
        add_definitions(-DWITH_OPENEXR)
 endif()
index d7dbed51282bfb701b08b3cad97b029ca9bfee15..fcf00bdef7874e09233da8aa606adea854239e3c 100644 (file)
@@ -26,6 +26,9 @@ if env['WITH_BF_PYTHON']:
     if env['BF_DEBUG']:
         defs.append('_DEBUG')
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
+
 if env['OURPLATFORM'] == 'linux':
     cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'