diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 20:00:23 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 20:00:23 +0400 |
| commit | 25b1280c504c0a80010de7c74ef65c887a8d9cf8 (patch) | |
| tree | f78c5def866916a999ada286b3da333d6f21447e /build_files/buildbot/config | |
| parent | c215faf9f4c02774a430ea9b960fede7a1ed209c (diff) | |
OSX: buildbot cleanups after carbon removal
Diffstat (limited to 'build_files/buildbot/config')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 10 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index ad0fbcc78da..c86bc284d0b 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -13,7 +13,7 @@ USE_SDK=True ############################################################################# ################### Cocoa & architecture settings ################## ############################################################################# -WITH_GHOST_COCOA=True + MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 @@ -43,8 +43,7 @@ cmd = 'xcodebuild -showsdks' cmd_sdk=commands.getoutput(cmd) 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 @@ -352,10 +351,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: diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index fb0a084cf4d..e51259ad5af 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.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 @@ -43,8 +43,7 @@ cmd = 'xcodebuild -showsdks' cmd_sdk=commands.getoutput(cmd) 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 @@ -352,10 +351,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: |