[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40667] trunk/blender: OSX: Give clear commenting and more up-to-date defaults

[jens verwiebe]

Revision: 40667
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40667
Author:   jensverwiebe
Date:     2011-09-28 17:28:37 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
OSX: Give clear commenting and more up-to-date defaults

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/quicktime/SConscript

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2011-09-28 17:21:08 UTC (rev 40666)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2011-09-28 17:28:37 UTC (rev 40667)
@@ -90,9 +90,10 @@
 ###################          Dependency settings           ##################
 #############################################################################
 
-#Defaults openMP to true if compiler handles it
+#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
+# if your compiler don´t has accurate suffix you may have to enable it by hand !
 if CC.endswith('4.6.1'):
-    WITH_BF_OPENMP = True  # multithreading for fluids, cloth and smoke
+    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
 else:
     WITH_BF_OPENMP = False
 

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2011-09-28 17:21:08 UTC (rev 40666)
+++ trunk/blender/intern/ghost/SConscript	2011-09-28 17:28:37 UTC (rev 40667)
@@ -102,8 +102,8 @@
 if window_system in ('win32-vc', 'win64-vc'):
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') )
 
-elif env['OURPLATFORM'] == 'darwin':	 # compile ghost always with apple-gcc to keep objectiveC compatibility
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' ) #, cc_compileflags=env['CXXFLAGS'].append('-fobjc-exceptions')
+elif env['OURPLATFORM'] == 'darwin':	 # always use Apple-gcc-4.2 for objC language, for gnu-compilers don´t support it fully yet
+    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' )
     print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
 
 else:

Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript	2011-09-28 17:21:08 UTC (rev 40666)
+++ trunk/blender/source/blender/quicktime/SConscript	2011-09-28 17:28:37 UTC (rev 40667)
@@ -35,6 +35,6 @@
 
 if env['WITH_GHOST_COCOA']:
     defs.append('GHOST_COCOA')
-    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2')
+    env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2') # always use Apple-gcc-4.2 for objC language, for gnu-compilers don´t support it fully yet
 else:
     env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)