fix for crash drawing weights in lattice editmode.
[blender.git] / SConstruct
index 6c404784ab0842362ebdc8d290b883700887fcc4..30d8788f040936311e892937c4da87d9a4187c15 100644 (file)
@@ -402,7 +402,7 @@ thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
-       env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+       env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
        playerlist = B.create_blender_liblist(env, 'player')
        playerlist += B.create_blender_liblist(env, 'intern')
@@ -611,18 +611,6 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
                                        '${BF_FFMPEG_LIBPATH}/avutil-50.dll',
                                        '${BF_FFMPEG_LIBPATH}/swscale-0.dll']
 
-               if env['OURPLATFORM'] != 'linuxcross':
-                       #
-                       # TODO: Does it mean we haven't got support of this codecs if
-                       #       we're using cross-compilation?
-                       #       Or in case of native compilation this libraries are
-                       #       unneccessary to?
-                       #
-                       dllsources += ['${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-                                                       '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-                                                       '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-                                                       '${LCGDIR}/ffmpeg/lib/libx264-67.dll']
-
        if env['WITH_BF_JACK']:
                dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
        windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)