kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX: buildbot cleanups after carbon removal

Browse Source
This commit is contained in:
Jens Verwiebe 2013-11-05 16:00:23 +00:00
parent c215faf9f4
commit 25b1280c50
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_files/buildbot/config/user-config-mac-i386.py
View File

@ -13,7 +13,7 @@ USE_SDK=True
############################################################################# #############################################################################
################### Cocoa & architecture settings ################## ################### Cocoa & architecture settings ##################
############################################################################# #############################################################################
WITH_GHOST_COCOA=True
MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
@ -43,8 +43,7 @@ cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd) cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk MACOSX_SDK_CHECK=cmd_sdk
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': USE_QTKIT=True # Carbon quicktime is not available for 64bit
USE_QTKIT=True # Carbon quicktime is not available for 64bit
# Default target OSX settings per architecture # Default target OSX settings per architecture
@ -352,10 +351,7 @@ CCFLAGS = ['-pipe','-funsigned-char']
CPPFLAGS = list(ARCH_FLAGS) 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
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
if WITH_BF_QUICKTIME: if WITH_BF_QUICKTIME:
if USE_QTKIT: if USE_QTKIT:

10
build_files/buildbot/config/user-config-mac-x86_64.py
View File

@ -13,7 +13,7 @@ USE_SDK=True
############################################################################# #############################################################################
################### Cocoa & architecture settings ################## ################### Cocoa & architecture settings ##################
############################################################################# #############################################################################
WITH_GHOST_COCOA=True
MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
@ -43,8 +43,7 @@ cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd) cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk MACOSX_SDK_CHECK=cmd_sdk
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': USE_QTKIT=True # Carbon quicktime is not available for 64bit
USE_QTKIT=True # Carbon quicktime is not available for 64bit
# Default target OSX settings per architecture # Default target OSX settings per architecture
@ -352,10 +351,7 @@ CCFLAGS = ['-pipe','-funsigned-char']
CPPFLAGS = list(ARCH_FLAGS) 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
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
if WITH_BF_QUICKTIME: if WITH_BF_QUICKTIME:
if USE_QTKIT: if USE_QTKIT: