From 9aa380b67ee0bf5542fd2b190bc6349b5bf9a537 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Fri, 30 Oct 2009 20:47:13 +0000 Subject: [PATCH] Make Collada False by default everywhere --- config/win32-mingw-config.py | 4 ++++ tools/btools.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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/tools/btools.py b/tools/btools.py index 4f554a6901b..326c0412cea 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -335,7 +335,7 @@ def read_opts(cfg, args): ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), - (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', True)), + (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', False)), ('BF_COLLADA', 'COLLADA base path', ''), ('BF_COLLADA_INC', 'COLLADA include path', ''), ('BF_COLLADA_LIB', 'COLLADA library', ''),