From 93173a6dd4eaf1955516e35335009494a92f300b Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Fri, 30 Oct 2009 20:20:48 +0000 Subject: Mac / COCOA : - fix 10.4 compile issues - fix some scons issues & add WITH_BF_COLLADA = False in scons darwin_config.py to allow build waiting for complete Collada Mac implementation --- 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 6dd65aeb40f..8a1b0eff6c1 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -246,6 +246,9 @@ BF_OPENGL_LIB = 'GL GLU' BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries' BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL'] +#OpenCollada flags +WITH_BF_COLLADA = False + ############################################################################# ################### various compile settings and flags ################## ############################################################################# -- cgit v1.2.3 From 9aa380b67ee0bf5542fd2b190bc6349b5bf9a537 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Fri, 30 Oct 2009 20:47:13 +0000 Subject: Make Collada False by default everywhere --- config/win32-mingw-config.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 6b10b410715..b519aa95ca7 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -126,6 +126,10 @@ 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' ] + +# Disable Collada by default +WITH_BF_COLLADA = False + ## CC = 'gcc' CXX = 'g++' -- cgit v1.2.3 From 773253df724edf48ce798811c33635d03a6c2e37 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 2 Nov 2009 00:30:52 +0000 Subject: == COLLADA == * proper library names and order. Goes together with 76MB commit for r24225 --- config/win32-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 2c5781df75a..60463a07a32 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -145,7 +145,7 @@ BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = LIBDIR + '/opencollada' BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'opencollada' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' WITH_BF_STATICOPENGL = False -- cgit v1.2.3 From 46487ad59eb9811c863c080e78b265900ed3e4ec Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 2 Nov 2009 23:55:04 +0000 Subject: == COLLADA == * fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263). --- config/win64-vc-config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 429f8b0b6d6..53df6d96bf8 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -158,7 +158,7 @@ BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = LIBDIR + '/opencollada' BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'opencollada' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' WITH_BF_STATICOPENGL = False -- cgit v1.2.3 From ff0ba86a9b8caaf744437fa23e1b16af72e0183d Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Mon, 9 Nov 2009 17:52:13 +0000 Subject: Mac : - scons update to build with openCollada - scons & cmake update for render optimization cflags --- config/darwin-config.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 8a1b0eff6c1..03cc4eb1f8c 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -31,7 +31,7 @@ elif cmd_res[0]=='9': elif cmd_res[0]=='10': MAC_CUR_VER='10.6' -if MAC_PROC == 'powerpc': +if MACOSX_ARCHITECTURE == 'ppc': LCGDIR = '#../lib/darwin-6.1-powerpc' else : LCGDIR = '#../lib/darwin-9.x.universal' @@ -39,7 +39,7 @@ LIBDIR = '${LCGDIR}' BF_PYTHON_VERSION = '3.1' -if MAC_PROC == 'powerpc' and BF_PYTHON_VERSION == '2.3': +if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3': MAC_MIN_VERS = '10.3' MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' CC = 'gcc' @@ -247,7 +247,20 @@ BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries' BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL'] #OpenCollada flags -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 = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2' +BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada' +BF_PCRE = LIBDIR + '/opencollada' +BF_PCRE_LIB = 'pcre' +BF_PCRE_LIBPATH = '${BF_PCRE}/lib' +#BF_EXPAT = '/usr' +#BF_EXPAT_LIB = 'expat' +#BF_EXPAT_LIBPATH = '/usr/lib' ############################################################################# ################### various compile settings and flags ################## -- cgit v1.2.3