diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SConstruct | 7 | ||||
| -rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 4 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 13 |
4 files changed, 21 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a504b0a986..75cefd0c219 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ mark_as_advanced(WITH_AUDASPACE) # (unix defaults to OpenMP On) -if(UNIX AND NOT APPLE) +if((UNIX AND NOT APPLE) OR (MINGW)) set(PLATFORM_DEFAULT ON) else() set(PLATFORM_DEFAULT OFF) 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) diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 2649c5505d5..27286439297 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -169,8 +169,8 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib' WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] -#Produces errors while rendering with subsurf/multires, -WITH_BF_OPENMP = False +#May produce errors with unsupported MinGW-w64 builds +WITH_BF_OPENMP = True ## CC = 'gcc' diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d9ac43d7622..940c92b349c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -551,9 +551,20 @@ elseif(WIN32) ) elseif(WITH_MINGW64) install( - FILES ${LIBDIR}/binaries/pthreadGC2-w64.dll + FILES + ${LIBDIR}/binaries/libgcc_s_sjlj-1.dll + ${LIBDIR}/binaries/libwinpthread-1.dll + ${LIBDIR}/binaries/libstdc++-6.dll DESTINATION ${TARGETDIR} ) + + if(WITH_OPENMP) + install( + FILES + ${LIBDIR}/binaries/libgomp-1.dll + DESTINATION ${TARGETDIR} + ) + endif() endif() endif() |