diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-22 16:51:29 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-22 16:51:29 +0300 |
commit | 851201353621d053552dda1e92bf3f7d305e30f0 (patch) | |
tree | e0b4d233647ecbf4136df5bd33a69612a63415d5 /config | |
parent | b91beefdb7f2def2fa7a0a18bc39902c45c72076 (diff) | |
parent | 8b84cc2ab65790604722eeaba89a34095d2e7259 (diff) |
COLLADA branch: merge from trunk -r 24522:24758.
Diffstat (limited to 'config')
-rw-r--r-- | config/darwin-config.py | 37 | ||||
-rw-r--r-- | config/irix6-config.py | 2 | ||||
-rw-r--r-- | config/linux2-config.py | 4 | ||||
-rw-r--r-- | config/linuxcross-config.py | 2 | ||||
-rw-r--r-- | config/sunos5-config.py | 2 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 2 |
6 files changed, 28 insertions, 21 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 03cc4eb1f8c..825d00f892d 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -13,7 +13,6 @@ USE_SDK=True ############################################################################# ################### Cocoa & architecture settings ################## ############################################################################# - WITH_GHOST_COCOA=True MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 @@ -31,30 +30,36 @@ elif cmd_res[0]=='9': elif cmd_res[0]=='10': MAC_CUR_VER='10.6' -if MACOSX_ARCHITECTURE == 'ppc': - LCGDIR = '#../lib/darwin-6.1-powerpc' -else : - LCGDIR = '#../lib/darwin-9.x.universal' -LIBDIR = '${LCGDIR}' - BF_PYTHON_VERSION = '3.1' -if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3': +if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': + USE_QTKIT=True # Carbon quicktime is not available for 64bit + + +# Default target OSX settings per architecture +# Can be customized + +if MACOSX_ARCHITECTURE == 'ppc': MAC_MIN_VERS = '10.3' MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' - CC = 'gcc' - CXX = 'g++' -elif MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc': + LCGDIR = '#../lib/darwin-6.1-powerpc' + CC = 'gcc-3.3' + CXX = 'g++-3.3' +elif MACOSX_ARCHITECTURE == 'i386': MAC_MIN_VERS = '10.4' MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk' + LCGDIR = '#../lib/darwin-8.x.i386' CC = 'gcc-4.0' CXX = 'g++-4.0' else : MAC_MIN_VERS = '10.5' MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk' + LCGDIR = '#../lib/darwin-9.x.universal' CC = 'gcc-4.2' CXX = 'g++-4.2' +LIBDIR = '${LCGDIR}' + ############################################################################# ################### Dependency settings ################## ############################################################################# @@ -229,10 +234,7 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': - WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm ) -else: - WITH_BF_QUICKTIME = True +WITH_BF_QUICKTIME = True WITH_BF_ICONV = True BF_ICONV = '/usr' @@ -285,7 +287,10 @@ 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 == True: - PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] + if USE_QTKIT == True: + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit'] + else: + PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 LLIBS = ['stdc++', 'SystemStubs'] diff --git a/config/irix6-config.py b/config/irix6-config.py index 085d1dd1e62..ab2ef02c977 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -161,7 +161,7 @@ CXX = 'CC' CCFLAGS = ['-pipe','-fPIC', '-n32'] -CPPFLAGS = ['-DXP_UNIX'] +CPPFLAGS = [] CXXFLAGS = ['-pipe','-fPIC', '-n32'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/linux2-config.py b/config/linux2-config.py index c0c600f2498..f03daacbdba 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -165,6 +165,8 @@ BF_EXPAT = '/usr' BF_EXPAT_LIB = 'expat' BF_EXPAT_LIBPATH = '/usr/lib' +WITH_BF_OPENMP = True + ## CC = 'gcc' CXX = 'g++' @@ -173,7 +175,7 @@ CXX = 'g++' CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -CPPFLAGS = ['-DXP_UNIX'] +CPPFLAGS = [] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index a5c83dc3503..3cfa1158700 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -119,7 +119,7 @@ CXX = 'i586-mingw32msvc-g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] -CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ] +CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS'] CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = [ '-O2' ] REL_CCFLAGS = [ '-O2' ] diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 8e4c53b5bc4..88dce927db4 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -136,7 +136,7 @@ CXX = 'g++' CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS'] +CPPFLAGS = ['-DSUN_OGL_NO_VERTEX_MACROS'] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index b519aa95ca7..709261ec1ca 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -136,7 +136,7 @@ CXX = 'g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] -CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ] +CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS'] CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = [ '-O2' ] REL_CCFLAGS = [ '-O2' ] |