==SCons==

* Fix typo in bullet SConscript
* win32-vc now copies all necessary files to BF_INSTALLDIR, including dlls

diff --git a/SConstruct b/SConstruct
index 9f38201d4790c2559628227e9b98795cf6a229b8..4c6745e2b48c3d9c57292720568e3a37eef2654b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -289,9 +289,11 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
 
 allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
 
-if sys.platform=='win32':
-    # TODO: gather all needed dlls from lib/windows for inclusion in install
-    windlls = []
+if env['OURPLATFORM'] == 'win32-vc':
+    windlls = env.Install(dir=env['BF_INSTALLDIR'], source = ['#../lib/windows/gettext/lib/gnu_gettext.dll',
+               '#../lib/windows/png/lib/libpng.dll',
+               '#../lib/windows/sdl/lib/SDL.dll',
+               '#../lib/windows/zlib/lib/zlib.dll'])
     allinstall += windlls
 
 installtarget = env.Alias('install', allinstall)

diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript
index bb58c0c840e91962d9b14176ae09b4230d6f11a6..7441ab29b2457063a82d3a847276d905e06a0d1c 100644 (file)
--- a/extern/bullet/SConscript
+++ b/extern/bullet/SConscript
@@ -11,7 +11,7 @@ if env['OURPLATFORM']=='win32-vc':
     defs += ' WIN32 NDEBUG _WINDOWS _LIB'
     #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
     cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
-if env['OURPLATFORM']=='win32-mingw':
+elif env['OURPLATFORM']=='win32-mingw':
     defs += ' NDEBUG'
     cflags += ['-O2']
 elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5':
@@ -20,7 +20,6 @@ elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='free
 elif sys.platform=='darwin':
     defs += ' NDEBUG'
     cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math', '-mpowerpc' , '-mtune=G4']
-
 else:
     print "################################################"
     print