[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61134] trunk/blender/build_files/scons/ config/darwin-config.py: OSX/scons: remove obsolete cocoa conditionals from config
jens verwiebe
info at jensverwiebe.de
Tue Nov 5 15:38:18 CET 2013
Revision: 61134
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61134
Author: jensverwiebe
Date: 2013-11-05 14:38:18 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX/scons: remove obsolete cocoa conditionals from config
Modified Paths:
--------------
trunk/blender/build_files/scons/config/darwin-config.py
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2013-11-05 14:35:09 UTC (rev 61133)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2013-11-05 14:38:18 UTC (rev 61134)
@@ -13,7 +13,7 @@
#############################################################################
################### Cocoa & architecture settings ##################
#############################################################################
-WITH_GHOST_COCOA=True
+
MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
@@ -359,10 +359,7 @@
CPPFLAGS = list(ARCH_FLAGS)
-if WITH_GHOST_COCOA:
- PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
-else:
- PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
if WITH_BF_QUICKTIME:
if USE_QTKIT:
More information about the Bf-blender-cvs
mailing list