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:
authorAntony Riakiotakis <kalast@gmail.com>2012-07-05 15:39:11 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-07-05 15:39:11 +0400
commitfa92f2fb5524165c3c2ef0e7b37f60f0971a58cd (patch)
treea397f9817a95deaacd1cedcf0e3dc442734f624e /SConstruct
parent2442bcf80707234afdd9013348793768f4ae03f2 (diff)
Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct7
1 files changed, 6 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 088361af649..1da1334f1f0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -769,8 +769,13 @@ if env['OURPLATFORM'] == 'win64-mingw':
if env['WITH_BF_SDL']:
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
+ if(env['WITH_BF_OPENMP'])
+ dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
- dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll')
+ dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll)')
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)