svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-15 13:02:37 +00:00
parent e715a7185c 9648c6016b
commit 30293dc2ca
588 changed files with 42706 additions and 18021 deletions
--- a/2
+++ b/2
@@ -645,7 +645,7 @@ else:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
    dllsources = []

-    if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+    if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
        # For MinGW and linuxcross static linking will be used
        dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']