[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61191] trunk/blender: OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS

[jens verwiebe]

Revision: 61191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61191
Author:   jensverwiebe
Date:     2013-11-07 13:56:40 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-11-07 13:32:32 UTC (rev 61190)
+++ trunk/blender/SConstruct	2013-11-07 13:56:40 UTC (rev 61191)
@@ -360,9 +360,9 @@
         ARCH_FLAGS = ['-m64']
     else:
         ARCH_FLAGS = ['-m32']
-		
-	env['CPPFLAGS'] = list(ARCH_FLAGS)
 
+    env.Append(CPPFLAGS=ARCH_FLAGS)
+
     SDK_FLAGS=['-isysroot',  env['MACOSX_SDK'],'-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-arch',env['MACOSX_ARCHITECTURE']] # always used
     env['PLATFORM_LINKFLAGS'] = ['-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-isysroot', env['MACOSX_SDK'],'-arch',env['MACOSX_ARCHITECTURE']]+env['PLATFORM_LINKFLAGS']
     env['CCFLAGS']=SDK_FLAGS+env['CCFLAGS']

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-11-07 13:32:32 UTC (rev 61190)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-11-07 13:56:40 UTC (rev 61191)
@@ -230,6 +230,7 @@
 CFLAGS = []
 CXXFLAGS = []
 CCFLAGS = ['-pipe','-funsigned-char']
+CPPFLAGS = []
 
 PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']