Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2009-02-21 01:08:02 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2009-02-21 01:08:02 +0300
commit64dd45ef4371575f3090858cd3b4abbbabed3a2b (patch)
tree03a70f264ded81e54e4acc77f7e6e4b52b88ae59 /extern/bullet2/src/SConscript
parentd56fd6d4cef0230665e0acf299dce4d400a7461d (diff)
2.5 / Scons | Building on 64bit Windows
* add preliminary support for building Blender on 64bit Windows with _msvc_. The SConstruct should automatically detect if you are on a 64bit Windows and if you have that 64bit build is assumed. If you're not, 32bit build is assumed. NOTE: this is still very much wip, so your mileage may vary. Do please report on b25 taskforce ML in case of trouble. NOTE2: many of the libs are being linked in statically NOTE3: hopefully I didn't break anything for other build platforms (mingw, linux, osx). NOTE4: comes after NOTE3
Diffstat (limited to 'extern/bullet2/src/SConscript')
-rw-r--r--extern/bullet2/src/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index a2b17598727..5811e97319d 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -7,7 +7,7 @@ Import('env')
defs = 'USE_DOUBLES QHULL _LIB'
cflags = []
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']