From aac16ce4ecacf69e3be5a34f3b4a911428e9217a Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Sat, 14 Nov 2009 13:01:14 +0000 Subject: - scons fix for 10.4 build (use the 10.4 libs dir) - warning fix in ghost/cocoa --- config/darwin-config.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 03cc4eb1f8c..249598e8a47 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -31,30 +31,32 @@ 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': +# 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 ################## ############################################################################# -- cgit v1.2.3 From a9e79d255dca224eca1885834a6d8dedf3401250 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Wed, 18 Nov 2009 15:54:25 +0000 Subject: scons update to enable build with QTKit (Cocoa Quicktime) Thx Jens Verwiebe for the patch --- config/darwin-config.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 249598e8a47..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 @@ -33,6 +32,10 @@ elif cmd_res[0]=='10': BF_PYTHON_VERSION = '3.1' +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 @@ -231,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' @@ -287,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'] -- cgit v1.2.3 From b895b2e48f3910c2ff4b971ce57fc4fe48e2c24a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 19 Nov 2009 11:49:42 +0000 Subject: - remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own code and /usr/include, its only used in our netscape plugin. - CMake on unix default OpenMP to enabled. - Scons on linux default OpenMP to enabled. - copying python is slow, for scons only copy if the directory has not been created. --- config/irix6-config.py | 2 +- config/linux2-config.py | 4 +++- config/linuxcross-config.py | 2 +- config/sunos5-config.py | 2 +- config/win32-mingw-config.py | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'config') 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 dffc861fca8..3eccb913932 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' ] -- cgit v1.2.3