forked from bartvdbraak/blender
== COLLADA ==
* fix win64 build and add proper library usage for COLLADA 64bit. Update also lib/win64 (r24263).
This commit is contained in:
parent
5ff7cbd2f9
commit
46487ad59e
@ -124,7 +124,10 @@ if toolset:
|
|||||||
#if env:
|
#if env:
|
||||||
# btools.SetupSpawn(env)
|
# btools.SetupSpawn(env)
|
||||||
else:
|
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:
|
if not env:
|
||||||
print "Could not create a build environment"
|
print "Could not create a build environment"
|
||||||
|
@ -158,7 +158,7 @@ BF_COLLADA_LIB = 'bf_collada'
|
|||||||
|
|
||||||
BF_OPENCOLLADA = LIBDIR + '/opencollada'
|
BF_OPENCOLLADA = LIBDIR + '/opencollada'
|
||||||
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
|
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'
|
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
|
||||||
|
|
||||||
WITH_BF_STATICOPENGL = False
|
WITH_BF_STATICOPENGL = False
|
||||||
|
@ -76,7 +76,7 @@ abort();
|
|||||||
#endif /* breakpoint */
|
#endif /* breakpoint */
|
||||||
|
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(__GNUC__)
|
#if defined(_WIN32) && !defined(__GNUC__)
|
||||||
#define MT_assert(predicate) assert(predicate)
|
#define MT_assert(predicate) assert(predicate)
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user