== COLLADA ==
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 2 Nov 2009 23:55:04 +0000 (23:55 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 2 Nov 2009 23:55:04 +0000 (23:55 +0000)
* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).

SConstruct
config/win64-vc-config.py
intern/moto/include/MT_assert.h

index cb90c2eaf663094681d006430103327c4335b6e7..e6dd85e8cff6c1702df38b0ee25b3915a18bbe09 100644 (file)
@@ -124,7 +124,10 @@ if toolset:
                #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"
index 429f8b0b6d6aae4dd5ebdbe7fcfe767436c6e0e0..53df6d96bf8e5fae77145ccba5b95e41614e01c5 100644 (file)
@@ -158,7 +158,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
index 22f6b6a555c3e44596e6625ae18c07b81d348f0e..b8f18fc52ff290b6efc5b7d3a80e0b0261856805 100644 (file)
@@ -76,7 +76,7 @@ abort();
 #endif /* breakpoint */
 
 
-#if defined(WIN32) && !defined(__GNUC__)
+#if defined(_WIN32) && !defined(__GNUC__)
 #define MT_assert(predicate) assert(predicate)
 #else