Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-11-05 18:38:18 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-11-05 18:38:18 +0400
commitd278b59032c01e3659f6d48ab77597fc02ca7353 (patch)
treee79b7a399565fbb927b8880b71c38e05f3ee36be /build_files
parent4df23896e5acb1bd9785d4bf5f775483d6be93f5 (diff)
OSX/scons: remove obsolete cocoa conditionals from config
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/config/darwin-config.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index d44b94e42b5..ee35b2c9ceb 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -13,7 +13,7 @@ USE_SDK=True
#############################################################################
################### Cocoa & architecture settings ##################
#############################################################################
-WITH_GHOST_COCOA=True
+
MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
@@ -359,10 +359,7 @@ CCFLAGS = ['-pipe','-funsigned-char']
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: