[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41236] branches/bmesh/blender: svn merge ^/trunk/blender -r41150:41175

Campbell Barton ideasman42 at gmail.com
Mon Oct 24 07:00:54 CEST 2011 

Revision: 41236
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41236
Author:   campbellbarton
Date:     2011-10-24 05:00:53 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41150:41175

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41150

Modified Paths:
--------------
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
    branches/bmesh/blender/build_files/scons/config/darwin-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
    branches/bmesh/blender/build_files/scons/config/linux-config.py
    branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
    branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/Blender.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/intern/ghost/GHOST_Types.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/bmesh/blender/po/README.txt
    branches/bmesh/blender/po/update_mo.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/source/blender/blenfont/BLF_translation.h
    branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_internal.h
    branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_translation.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_util.c
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/intern/key.c
    branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
    branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
    branches/bmesh/blender/source/blender/blenlib/BLI_string_utf8.h
    branches/bmesh/blender/source/blender/blenlib/PIL_time.h
    branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
    branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
    branches/bmesh/blender/source/blender/blenlib/intern/string_utf8.c
    branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
    branches/bmesh/blender/source/blender/collada/ImageExporter.cpp
    branches/bmesh/blender/source/blender/editors/armature/poselib.c
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
    branches/bmesh/blender/source/blender/editors/screen/area.c
    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
    branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
    branches/bmesh/blender/source/blender/editors/space_file/file_panels.c
    branches/bmesh/blender/source/blender/editors/space_file/filesel.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
    branches/bmesh/blender/source/blender/editors/space_info/space_info.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_buttons.c
    branches/bmesh/blender/source/blender/editors/space_node/node_header.c
    branches/bmesh/blender/source/blender/editors/space_node/space_node.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/bmesh/blender/source/blender/editors/transform/transform.h
    branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
    branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
    branches/bmesh/blender/source/creator/CMakeLists.txt
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Added Paths:
-----------
    branches/bmesh/blender/release/datafiles/fonts/
    branches/bmesh/blender/release/datafiles/fonts/droidsans.ttf.gz
    branches/bmesh/blender/release/datafiles/locale/
    branches/bmesh/blender/release/datafiles/locale/ar/
    branches/bmesh/blender/release/datafiles/locale/ar/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ar/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/bg/
    branches/bmesh/blender/release/datafiles/locale/bg/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/bg/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ca/
    branches/bmesh/blender/release/datafiles/locale/ca/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ca/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/cs/
    branches/bmesh/blender/release/datafiles/locale/cs/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/cs/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/de/
    branches/bmesh/blender/release/datafiles/locale/de/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/de/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/el/
    branches/bmesh/blender/release/datafiles/locale/el/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/el/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/es/
    branches/bmesh/blender/release/datafiles/locale/es/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/es/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fa/
    branches/bmesh/blender/release/datafiles/locale/fa/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fa/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fi/
    branches/bmesh/blender/release/datafiles/locale/fi/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fi/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fr/
    branches/bmesh/blender/release/datafiles/locale/fr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/hr/
    branches/bmesh/blender/release/datafiles/locale/hr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/hr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/hr_HR/
    branches/bmesh/blender/release/datafiles/locale/hr_HR/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/it/
    branches/bmesh/blender/release/datafiles/locale/it/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/it/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ja/
    branches/bmesh/blender/release/datafiles/locale/ja/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ja/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ko/
    branches/bmesh/blender/release/datafiles/locale/ko/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ko/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ne/
    branches/bmesh/blender/release/datafiles/locale/ne/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ne/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/nl/
    branches/bmesh/blender/release/datafiles/locale/nl/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/nl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/pl/
    branches/bmesh/blender/release/datafiles/locale/pl/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/pl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/pt_BR/
    branches/bmesh/blender/release/datafiles/locale/pt_BR/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ro/
    branches/bmesh/blender/release/datafiles/locale/ro/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ro/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ru/
    branches/bmesh/blender/release/datafiles/locale/ru/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ru/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sr/
    branches/bmesh/blender/release/datafiles/locale/sr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sv/
    branches/bmesh/blender/release/datafiles/locale/sv/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sv/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/uk/
    branches/bmesh/blender/release/datafiles/locale/uk/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/uk/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/zh_CN/
    branches/bmesh/blender/release/datafiles/locale/zh_CN/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/zh_TW/
    branches/bmesh/blender/release/datafiles/locale/zh_TW/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/zh_TW/LC_MESSAGES/blender.mo

Removed Paths:
-------------
    branches/bmesh/blender/build_files/scons/config/aix4-config.py
    branches/bmesh/blender/build_files/scons/config/irix6-config.py
    branches/bmesh/blender/build_files/scons/config/openbsd3-config.py
    branches/bmesh/blender/build_files/scons/config/sunos5-config.py
    branches/bmesh/blender/release/bin/.blender/
    branches/bmesh/blender/release/datafiles/fonts/droidsans.ttf.gz
    branches/bmesh/blender/release/datafiles/locale/ar/
    branches/bmesh/blender/release/datafiles/locale/ar/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ar/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/bg/
    branches/bmesh/blender/release/datafiles/locale/bg/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/bg/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ca/
    branches/bmesh/blender/release/datafiles/locale/ca/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ca/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/cs/
    branches/bmesh/blender/release/datafiles/locale/cs/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/cs/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/de/
    branches/bmesh/blender/release/datafiles/locale/de/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/de/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/el/
    branches/bmesh/blender/release/datafiles/locale/el/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/el/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/es/
    branches/bmesh/blender/release/datafiles/locale/es/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/es/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fa/
    branches/bmesh/blender/release/datafiles/locale/fa/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fa/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fi/
    branches/bmesh/blender/release/datafiles/locale/fi/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fi/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/fr/
    branches/bmesh/blender/release/datafiles/locale/fr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/fr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/hr/
    branches/bmesh/blender/release/datafiles/locale/hr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/hr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/hr_HR/
    branches/bmesh/blender/release/datafiles/locale/hr_HR/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/hr_HR/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/it/
    branches/bmesh/blender/release/datafiles/locale/it/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/it/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ja/
    branches/bmesh/blender/release/datafiles/locale/ja/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ja/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ko/
    branches/bmesh/blender/release/datafiles/locale/ko/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ko/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ne/
    branches/bmesh/blender/release/datafiles/locale/ne/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ne/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/nl/
    branches/bmesh/blender/release/datafiles/locale/nl/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/nl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/pl/
    branches/bmesh/blender/release/datafiles/locale/pl/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/pl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/pt_BR/
    branches/bmesh/blender/release/datafiles/locale/pt_BR/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ro/
    branches/bmesh/blender/release/datafiles/locale/ro/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ro/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/ru/
    branches/bmesh/blender/release/datafiles/locale/ru/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/ru/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sr/
    branches/bmesh/blender/release/datafiles/locale/sr/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/sv/
    branches/bmesh/blender/release/datafiles/locale/sv/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/sv/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/uk/
    branches/bmesh/blender/release/datafiles/locale/uk/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/uk/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/zh_CN/
    branches/bmesh/blender/release/datafiles/locale/zh_CN/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/datafiles/locale/zh_TW/
    branches/bmesh/blender/release/datafiles/locale/zh_TW/LC_MESSAGES/
    branches/bmesh/blender/release/datafiles/locale/zh_TW/LC_MESSAGES/blender.mo

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/blenlib/BLI_string_utf8.h
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-41150
   + /trunk/blender:39992-41175

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2011-10-24 04:52:43 UTC (rev 41235)
+++ branches/bmesh/blender/SConstruct	2011-10-24 05:00:53 UTC (rev 41236)
@@ -30,7 +30,6 @@
 # Then read all SConscripts and build
 #
 # TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
-# TODO: cleanup CCFLAGS / CPPFLAGS use, often both are set when we only need one.
 
 import platform as pltfrm
 
@@ -210,7 +209,7 @@
 
 if sys.platform=='win32':
     if bitness==64:
-        env.Append(CFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
+        env.Append(CPPFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
 
 if not env['BF_FANCY']:
     B.bc.disable()
@@ -283,22 +282,17 @@
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')
-                env['CPPFLAGS'].append('/openmp')
         else:
             if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
-                env['CPPFLAGS'].append('-openmp')
             else:
                 env.Append(CCFLAGS=['-fopenmp']) 
-                env.Append(CPPFLAGS=['-fopenmp'])
 
 if env['WITH_GHOST_COCOA'] == True:
-    env.Append(CFLAGS=['-DGHOST_COCOA']) 
-    env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+    env.Append(CPPFLAGS=['-DGHOST_COCOA']) 
     
 if env['USE_QTKIT'] == True:
-    env.Append(CFLAGS=['-DUSE_QTKIT'])
     env.Append(CPPFLAGS=['-DUSE_QTKIT'])
 
 #check for additional debug libnames
@@ -330,20 +324,15 @@
 # disable elbeem (fluidsim) compilation?
 if env['BF_NO_ELBEEM'] == 1:
     env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
-    env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
 
 if btools.ENDIAN == "big":
     env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
-    env['CCFLAGS'].append('-D__BIG_ENDIAN__')
 else:
     env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
-    env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')	
 
-
 # TODO, make optional
 env['CPPFLAGS'].append('-DWITH_AUDASPACE')
-env['CCFLAGS'].append('-DWITH_AUDASPACE')
 
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
 B.root_build_dir = env['BF_BUILDDIR']
@@ -505,65 +494,63 @@
 scriptinstall = []
 
 if env['OURPLATFORM']!='darwin':
-        for dp, dn, df in os.walk('release/bin/.blender'):
-            dp = os.path.normpath(dp)
+    dotblenderinstall = []
+    for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+        td, tf = os.path.split(targetdir)
+        dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+    for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
+        td, tf = os.path.split(targetdir)
+        dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+    
+    if env['WITH_BF_PYTHON']:
+        #-- local/VERSION/scripts
+        scriptpaths=['release/scripts']
+        for scriptpath in scriptpaths:
+            for dp, dn, df in os.walk(scriptpath):
+                if '.svn' in dn:
+                    dn.remove('.svn')
+                if '_svn' in dn:
+                    dn.remove('_svn')
+                if '__pycache__' in dn:  # py3.2 cache dir
+                    dn.remove('__pycache__')
 
-            if '.svn' in dn:
-                dn.remove('.svn')
-            if '_svn' in dn:
-                dn.remove('_svn')
-            
-            for f in df:
-                # This files aren't used anymore
-                if f in (".bfont.ttf", ):
-                    continue
+                dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+                dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
 
-                if not env['WITH_BF_INTERNATIONAL']:
-                    if 'locale' in dp:
-                        continue
-                if not env['WITH_BF_FREETYPE']:
-                    if f.endswith('.ttf'):
-                        continue
-                
-                if 'locale' in dp or 'fonts' in dp:
-                    datafileslist.append(os.path.join(dp,f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:]))    # skip bin
-                    datafilestargetlist.append(dir + os.sep + f)
+                source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
+                # To ensure empty dirs are created too
+                if len(source)==0:
+                    env.Execute(Mkdir(dir))
+                scriptinstall.append(env.Install(dir=dir,source=source))
+    
+    if env['WITH_BF_INTERNATIONAL']:
+        internationalpaths=['release' + os.sep + 'datafiles']
+        
+        def check_path(path, member):
+            return (member in path.split(os.sep))
+        
+        for intpath in internationalpaths:
+            for dp, dn, df in os.walk(intpath):
+                if '.svn' in dn:
+                    dn.remove('.svn')
+                if '_svn' in dn:
+                    dn.remove('_svn')
 
+                # we only care about release/datafiles/fonts, release/datafiles/locales
+                if check_path(dp, "fonts") or check_path(dp, "locale"):
+                    pass
                 else:
-                    dotblendlist.append(os.path.join(dp, f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:]))    # skip bin
-                    dottargetlist.append(dir + os.sep + f)
-                    
-        dotblenderinstall = []
-        for targetdir,srcfile in zip(dottargetlist, dotblendlist):
-            td, tf = os.path.split(targetdir)
-            dotblenderinstall.append(env.Install(dir=td, source=srcfile))
-        for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
-            td, tf = os.path.split(targetdir)
-            dotblenderinstall.append(env.Install(dir=td, source=srcfile))
-        
-        if env['WITH_BF_PYTHON']:
-            #-- local/VERSION/scripts
-            scriptpaths=['release/scripts']
-            for scriptpath in scriptpaths:
-                for dp, dn, df in os.walk(scriptpath):
-                    if '.svn' in dn:
-                        dn.remove('.svn')
-                    if '_svn' in dn:
-                        dn.remove('_svn')
-                    if '__pycache__' in dn:  # py3.2 cache dir
-                        dn.remove('__pycache__')
+                    continue
+                
+                dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+                dir += os.sep + os.path.basename(intpath) + dp[len(intpath):]
 
-                    dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
-                    dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
+                source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
+                # To ensure empty dirs are created too
+                if len(source)==0:
+                    env.Execute(Mkdir(dir))
+                scriptinstall.append(env.Install(dir=dir,source=source))
 
-                    source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
-                    # To ensure empty dirs are created too
-                    if len(source)==0:
-                        env.Execute(Mkdir(dir))
-                    scriptinstall.append(env.Install(dir=dir,source=source))
-
 #-- icons
 if env['OURPLATFORM']=='linux':
     iconlist = []

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-10-24 04:52:43 UTC (rev 41235)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-10-24 05:00:53 UTC (rev 41236)
@@ -94,6 +94,7 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-10-24 04:52:43 UTC (rev 41235)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-10-24 05:00:53 UTC (rev 41236)
@@ -85,6 +85,7 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-10-24 04:52:43 UTC (rev 41235)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-10-24 05:00:53 UTC (rev 41236)
@@ -85,6 +85,7 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-10-24 04:52:43 UTC (rev 41235)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-10-24 05:00:53 UTC (rev 41236)
@@ -94,6 +94,7 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']


@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list