diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
| commit | 985e784ae899c564eaeb9f30a9f653db4cf81b61 (patch) | |
| tree | c047c1c4aae1f583080c6476486e9f1e55d726ca /config | |
| parent | 91fcccc3ad5fd907ebba816797e35199757f2d18 (diff) | |
| parent | 31258507d047d6594a97fc99496855d6d1a83d5b (diff) | |
Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 3 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 4 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 |
3 files changed, 8 insertions, 1 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/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 73e6e39b7d1..d16575b47dd 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 |