diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 3 | ||||
| -rw-r--r-- | config/linux2-config.py | 2 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 4 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 4 | ||||
| -rw-r--r-- | config/win64-vc-config.py | 2 |
5 files changed, 11 insertions, 4 deletions
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 ################## ############################################################################# diff --git a/config/linux2-config.py b/config/linux2-config.py index dffc861fca8..536a3e0e327 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -151,7 +151,7 @@ BF_OPENGL_LIB = 'GL GLU X11 Xi' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' -WITH_BF_COLLADA = False +WITH_BF_COLLADA = True BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' 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++' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 2c5781df75a..d16575b47dd 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -138,14 +138,14 @@ BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' -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 = 'opencollada' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' WITH_BF_STATICOPENGL = False diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index 429f8b0b6d6..64f023ef7be 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -151,7 +151,7 @@ BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' -WITH_BF_COLLADA = False +WITH_BF_COLLADA = True BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' |