Revision: 22726
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22726
Author: jesterking
Date: 2009-08-23 23:16:39 +0200 (Sun, 23 Aug 2009)
Log Message:
-----------
* changes to have opencollada branch build on win32 and win64. Necessary
dependency (opencollada lib) hasn't been added to lib/windows and lib/win64
yet. If you need them, contact me please.
Modified Paths:
--------------
branches/soc-2009-chingachgook/config/win32-vc-config.py
branches/soc-2009-chingachgook/config/win64-vc-config.py
branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
branches/soc-2009-chingachgook/source/blender/collada/SConscript
branches/soc-2009-chingachgook/tools/Blender.py
branches/soc-2009-chingachgook/tools/btools.py
Modified: branches/soc-2009-chingachgook/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/win32-vc-config.py 2009-08-23
18:20:31 UTC (rev 22725)
+++ branches/soc-2009-chingachgook/config/win32-vc-config.py 2009-08-23
21:16:39 UTC (rev 22726)
@@ -139,6 +139,16 @@
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
+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_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified: branches/soc-2009-chingachgook/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/win64-vc-config.py 2009-08-23
18:20:31 UTC (rev 22725)
+++ branches/soc-2009-chingachgook/config/win64-vc-config.py 2009-08-23
21:16:39 UTC (rev 22726)
@@ -142,6 +142,16 @@
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
+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_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified:
branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
2009-08-23 18:20:31 UTC (rev 22725)
+++ branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
2009-08-23 21:16:39 UTC (rev 22726)
@@ -2825,6 +2825,11 @@
{
return armature_importer.write_controller(controller);
}
+
+ virtual bool writeFormulas( const COLLADAFW::Formulas* formulas )
+ {
+ return true;
+ }
};
void DocumentImporter::import(bContext *C, const char *filename)
Modified: branches/soc-2009-chingachgook/source/blender/collada/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/SConscript
2009-08-23 18:20:31 UTC (rev 22725)
+++ branches/soc-2009-chingachgook/source/blender/collada/SConscript
2009-08-23 21:16:39 UTC (rev 22726)
@@ -4,7 +4,7 @@
sources = env.Glob('*.cpp')
# relative paths to include dirs, space-separated, string
-incs = '../blenlib ../blenkernel ../makesdna ../makesrna ../windowmanager
../editors/include ../../../intern/guardedalloc
[OPENCOLLADA]/COLLADAStreamWriter/include
[OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include
[OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]',
env['BF_OPENCOLLADA'])
+incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna
../editors/include ../../../intern/guardedalloc
[OPENCOLLADA]/COLLADAStreamWriter/include
[OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include
[OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]',
env['BF_OPENCOLLADA_INC'])
env.BlenderLib ('bf_collada', sources, Split(incs), [], libtype='core',
priority=200 )
Modified: branches/soc-2009-chingachgook/tools/Blender.py
===================================================================
--- branches/soc-2009-chingachgook/tools/Blender.py 2009-08-23 18:20:31 UTC
(rev 22725)
+++ branches/soc-2009-chingachgook/tools/Blender.py 2009-08-23 21:16:39 UTC
(rev 22726)
@@ -150,8 +150,9 @@
if lenv['WITH_BF_COLLADA']:
libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH'])
- libincs += Split(lenv['BF_PCRE_LIBPATH'])
- libincs += Split(lenv['BF_EXPAT_LIBPATH'])
+ if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw',
'linuxcross', 'win64-vc'):
+ libincs += Split(lenv['BF_PCRE_LIBPATH'])
+ libincs += Split(lenv['BF_EXPAT_LIBPATH'])
return statlibs, libincs
@@ -199,9 +200,9 @@
if lenv['WITH_BF_LCMS']:
syslibs.append(lenv['BF_LCMS_LIB'])
if lenv['WITH_BF_COLLADA']:
- syslibs.append(lenv['BF_OPENCOLLADA_LIB'])
syslibs.append(lenv['BF_PCRE_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+ syslibs.append(lenv['BF_EXPAT_LIB'])
syslibs += lenv['LLIBS']
Modified: branches/soc-2009-chingachgook/tools/btools.py
===================================================================
--- branches/soc-2009-chingachgook/tools/btools.py 2009-08-23 18:20:31 UTC
(rev 22725)
+++ branches/soc-2009-chingachgook/tools/btools.py 2009-08-23 21:16:39 UTC
(rev 22726)
@@ -49,7 +49,7 @@
'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC',
'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME',
'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC',
'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
- 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC',
'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_LIB',
'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH',
'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
+ 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC',
'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB',
'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH',
'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC',
@@ -306,12 +306,13 @@
('BF_COLLADA_INC', 'COLLADA include path', ''),
('BF_COLLADA_LIB', 'COLLADA library', ''),
('BF_OPENCOLLADA', 'OpenCollada base path', ''),
+ ('BF_OPENCOLLADA_INC', 'OpenCollada base include path', ''),
('BF_OPENCOLLADA_LIB', 'OpenCollada library', ''),
('BF_OPENCOLLADA_LIBPATH', 'OpenCollada library path', ''),
('BF_PCRE', 'PCRE base path', ''),
('BF_PCRE_LIB', 'PCRE library', ''),
('BF_PCRE_LIBPATH', 'PCRE library path', ''),
- ('BF_EXPAT', 'Expat base path', ''),
+ ('BF_EXPAT', 'Expat base path', ''),
('BF_EXPAT_LIB', 'Expat library', ''),
('BF_EXPAT_LIBPATH', 'Expat library path', ''),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
