[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24264] trunk/blender: == COLLADA ==

[Nathan Letwory]

Revision: 24264
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24264
Author:   jesterking
Date:     2009-11-03 00:55:04 +0100 (Tue, 03 Nov 2009)

Log Message:
-----------
== COLLADA ==

* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/win64-vc-config.py
    trunk/blender/intern/moto/include/MT_assert.h

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-11-02 23:48:02 UTC (rev 24263)
+++ trunk/blender/SConstruct	2009-11-02 23:55:04 UTC (rev 24264)
@@ -124,7 +124,10 @@
 		#if env:
 		#	btools.SetupSpawn(env)
 else:
-	env = BlenderEnvironment(ENV = os.environ)
+	if bitness==64 and platform=='win32':
+		env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+	else:
+		env = BlenderEnvironment(ENV = os.environ)
 
 if not env:
 	print "Could not create a build environment"

Modified: trunk/blender/config/win64-vc-config.py
===================================================================
--- trunk/blender/config/win64-vc-config.py	2009-11-02 23:48:02 UTC (rev 24263)
+++ trunk/blender/config/win64-vc-config.py	2009-11-02 23:55:04 UTC (rev 24264)
@@ -158,7 +158,7 @@
 
 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

Modified: trunk/blender/intern/moto/include/MT_assert.h
===================================================================
--- trunk/blender/intern/moto/include/MT_assert.h	2009-11-02 23:48:02 UTC (rev 24263)
+++ trunk/blender/intern/moto/include/MT_assert.h	2009-11-02 23:55:04 UTC (rev 24264)
@@ -76,7 +76,7 @@
 #endif /* breakpoint */
 
 
-#if defined(WIN32) && !defined(__GNUC__)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define MT_assert(predicate) assert(predicate)
 #else