Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.
This commit is contained in:
@@ -148,7 +148,7 @@ mark_as_advanced(WITH_AUDASPACE)
|
|||||||
|
|
||||||
|
|
||||||
# (unix defaults to OpenMP On)
|
# (unix defaults to OpenMP On)
|
||||||
if(UNIX AND NOT APPLE)
|
if((UNIX AND NOT APPLE) OR (MINGW))
|
||||||
set(PLATFORM_DEFAULT ON)
|
set(PLATFORM_DEFAULT ON)
|
||||||
else()
|
else()
|
||||||
set(PLATFORM_DEFAULT OFF)
|
set(PLATFORM_DEFAULT OFF)
|
||||||
|
@@ -769,8 +769,13 @@ if env['OURPLATFORM'] == 'win64-mingw':
|
|||||||
if env['WITH_BF_SDL']:
|
if env['WITH_BF_SDL']:
|
||||||
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
|
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}/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')
|
dllsources.append('#source/icons/blender.exe.manifest')
|
||||||
|
|
||||||
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
|
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
|
||||||
|
@@ -169,8 +169,8 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib'
|
|||||||
WITH_BF_RAYOPTIMIZATION = True
|
WITH_BF_RAYOPTIMIZATION = True
|
||||||
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
|
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
|
||||||
|
|
||||||
#Produces errors while rendering with subsurf/multires,
|
#May produce errors with unsupported MinGW-w64 builds
|
||||||
WITH_BF_OPENMP = False
|
WITH_BF_OPENMP = True
|
||||||
|
|
||||||
##
|
##
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
|
@@ -551,9 +551,20 @@ elseif(WIN32)
|
|||||||
)
|
)
|
||||||
elseif(WITH_MINGW64)
|
elseif(WITH_MINGW64)
|
||||||
install(
|
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}
|
DESTINATION ${TARGETDIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(WITH_OPENMP)
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
${LIBDIR}/binaries/libgomp-1.dll
|
||||||
|
DESTINATION ${TARGETDIR}
|
||||||
|
)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user