From 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Sun, 29 Nov 2009 19:16:52 +0000 Subject: Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail. --- config/linux2-config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/linux2-config.py b/config/linux2-config.py index 3eccb913932..3e40b7af416 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -155,9 +155,9 @@ WITH_BF_COLLADA = False BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' -BF_OPENCOLLADA = '' -BF_OPENCOLLADA_LIB = 'OpenCollada' -BF_OPENCOLLADA_LIBPATH = '/usr/lib' +BF_OPENCOLLADA = '/usr' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre Buffer ftoa' +BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' BF_PCRE = '' BF_PCRE_LIB = 'pcre' BF_PCRE_LIBPATH = '/usr/lib' -- cgit v1.2.3 From bd8f50234f090e07cff293f3aef98bf61f7b4f14 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Tue, 1 Dec 2009 11:19:18 +0000 Subject: Mac scons config: enable cross-compile, set 10.4 as default for ppc (using darwin-8.0.0-powerpc libs), set opencollada not to be built by default --- config/darwin-config.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 825d00f892d..beb8f0d3e59 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -40,11 +40,17 @@ if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': # Can be customized if MACOSX_ARCHITECTURE == 'ppc': - MAC_MIN_VERS = '10.3' - MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' - LCGDIR = '#../lib/darwin-6.1-powerpc' - CC = 'gcc-3.3' - CXX = 'g++-3.3' +# ppc release are now made for 10.4 +# MAC_MIN_VERS = '10.3' +# MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' +# LCGDIR = '#../lib/darwin-6.1-powerpc' +# CC = 'gcc-3.3' +# CXX = 'g++-3.3' + MAC_MIN_VERS = '10.4' + MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk' + LCGDIR = '#../lib/darwin-8.0.0-powerpc' + CC = 'gcc-4.0' + CXX = 'g++-4.0' elif MACOSX_ARCHITECTURE == 'i386': MAC_MIN_VERS = '10.4' MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk' @@ -249,7 +255,7 @@ BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries' BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL'] #OpenCollada flags -WITH_BF_COLLADA = True +WITH_BF_COLLADA = False BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' @@ -303,8 +309,8 @@ if MAC_MIN_VERS == '10.3': LLIBS.append('crt3.o') if USE_SDK==True: - SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS] - PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK]+PLATFORM_LINKFLAGS + SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE] + PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS CCFLAGS=SDK_FLAGS+CCFLAGS CXXFLAGS=SDK_FLAGS+CXXFLAGS -- cgit v1.2.3 From 5a3791ab5b2274fffde961bd01c75bacee74f634 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 2 Dec 2009 00:57:12 +0000 Subject: Apply patch [#20145] Ghost Win32 roundup patch: Minimum Window Size, Continuous Grab and Drag And Drop This nice patch by Matt D. (matd in #blendercoders) adds three nice features that can be seen already in the other supported OSes: * minimum window size: to prevent some bugs with the window manager of Blender, system windows cannot be resized smaller than the minimum size. * Continuous Grab is finally in Windows! Default settings since alpha 0 already have the feature enabled by default, so grab a new build and enjoy :) * GHOST support for drag and drop added. This prepares Blender for drag and drop from OS -> Blender. Currently not very useful, since wm needs to be readied for that. But it does work (do BF_GHOST_DEBUG=1 build and drag a file onto a Blender window). Thanks Matt D.! --- config/win32-mingw-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 709261ec1ca..0f07ca4c2ee 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -145,7 +145,7 @@ C_WARN = [ '-Wno-char-subscripts', '-Wdeclaration-after-statement' ] CC_WARN = [ '-Wall' ] -LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++'] +LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid'] BF_DEBUG = False BF_DEBUG_CCFLAGS= ['-g'] -- cgit v1.2.3 From 59ae9d855d6d350bfbd0dbe2d3bfba39b0889888 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Wed, 2 Dec 2009 18:06:39 +0000 Subject: Mac: Following 10.4 ppc libs availability, update cmake & scons default settings --- config/darwin-config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index beb8f0d3e59..55cb5d6a253 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -153,7 +153,7 @@ BF_JACK_INC = '${BF_JACK}/include/jack' BF_JACK_LIB = 'jack' BF_JACK_LIBPATH = '${BF_JACK}/lib' -WITH_BF_SNDFILE = False +WITH_BF_SNDFILE = True BF_SNDFILE = LIBDIR + '/sndfile' BF_SNDFILE_INC = '${BF_SNDFILE}/include' BF_SNDFILE_LIB = 'sndfile' @@ -211,7 +211,7 @@ BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' -WITH_BF_FFTW3 = False +WITH_BF_FFTW3 = True BF_FFTW3 = LIBDIR + '/fftw3' BF_FFTW3_INC = '${BF_FFTW3}/include' BF_FFTW3_LIB = 'libfftw3' -- cgit v1.2.3 From 543844048344f7adda8e37a5deb7eafcc944f985 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sat, 5 Dec 2009 01:24:45 +0000 Subject: * enabled COLLADA for mingw. (Compiles at least with MingW GCC 3.4.2). --- config/win32-mingw-config.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 0f07ca4c2ee..7973ae930b4 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -127,8 +127,15 @@ BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a' '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a', '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ] -# Disable Collada by default -WITH_BF_COLLADA = False +WITH_BF_COLLADA = True +BF_COLLADA = '#source/blender/collada' +BF_COLLADA_INC = '${BF_COLLADA}' +BF_COLLADA_LIB = 'bf_collada' + +BF_OPENCOLLADA = LIBDIR + '/opencollada' +BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' +BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' ## CC = 'gcc' -- cgit v1.2.3 From 11af0ff2702ccd02f5dd7528e3f4c5039c635144 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 10 Dec 2009 00:51:13 +0000 Subject: * WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd. This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage what SSE flags are best for the platform built for. Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only. --- config/darwin-config.py | 8 ++++++++ config/linux2-config.py | 4 ++++ config/win32-mingw-config.py | 4 ++++ config/win32-vc-config.py | 5 +++++ config/win64-vc-config.py | 4 ++++ 5 files changed, 25 insertions(+) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 55cb5d6a253..049fe62f3b0 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -270,6 +270,14 @@ BF_PCRE_LIBPATH = '${BF_PCRE}/lib' #BF_EXPAT_LIB = 'expat' #BF_EXPAT_LIBPATH = '/usr/lib' +#Ray trace optimization +WITH_BF_RAYOPTIMIZATION = False +if MACOSX_ARCHITECTURE == 'i386': + BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] +elif MACOSX_ARCHITECTURE == 'x86_64': + BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2'] + + ############################################################################# ################### various compile settings and flags ################## ############################################################################# diff --git a/config/linux2-config.py b/config/linux2-config.py index 3e40b7af416..abe79ba5806 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -167,6 +167,10 @@ BF_EXPAT_LIBPATH = '/usr/lib' WITH_BF_OPENMP = True +#Ray trace optimization +WITH_BF_RAYOPTIMIZATION = False +BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] + ## CC = 'gcc' CXX = 'g++' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 7973ae930b4..00c70aaaf1f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -137,6 +137,10 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' +#Ray trace optimization +WITH_BF_RAYOPTIMIZATION = False +BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] + ## CC = 'gcc' CXX = 'g++' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 60463a07a32..f18ed3e2007 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -148,6 +148,10 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' +#Ray trace optimization +WITH_BF_RAYOPTIMIZATION = False +BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE'] + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' @@ -155,6 +159,7 @@ BF_OPENGL_LIB = 'opengl32 glu32' BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a', '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a', '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ] + CC = 'cl.exe' CXX = 'cl.exe' diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 53df6d96bf8..457640507da 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -161,6 +161,10 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' +#Ray trace optimization +WITH_BF_RAYOPTIMIZATION = False +BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2'] + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' -- cgit v1.2.3 From e1f38245476fdfdb8eae03b895fb2469ac0df0ee Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Wed, 23 Dec 2009 15:56:00 +0000 Subject: OSX / Scons : set MACOSX_DEPLOYMENT_TARGET env var to allow builds for older systems --- config/darwin-config.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 049fe62f3b0..a2ce9c3331a 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -47,18 +47,21 @@ if MACOSX_ARCHITECTURE == 'ppc': # CC = 'gcc-3.3' # CXX = 'g++-3.3' MAC_MIN_VERS = '10.4' + MACOSX_DEPLOYMENT_TARGET = '10.4' MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk' LCGDIR = '#../lib/darwin-8.0.0-powerpc' CC = 'gcc-4.0' CXX = 'g++-4.0' elif MACOSX_ARCHITECTURE == 'i386': MAC_MIN_VERS = '10.4' + MACOSX_DEPLOYMENT_TARGET = '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_DEPLOYMENT_TARGET = '10.5' MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk' LCGDIR = '#../lib/darwin-9.x.universal' CC = 'gcc-4.2' -- cgit v1.2.3