bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

== COLLADA ==

Browse Source 
* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).
This commit is contained in:
Nathan Letwory 2009-11-02 23:55:04 +00:00
parent 5ff7cbd2f9
commit 46487ad59e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View 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"

2
config/win64-vc-config.py
View 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

2
intern/moto/include/MT_assert.h
View 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