From 4782522379b708f15bd5b045ca4193637c465979 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 24 Apr 2012 12:57:58 +0000 Subject: Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. Thanks! --- SConstruct | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index e73d654a0c8..96d27ae76b0 100644 --- a/SConstruct +++ b/SConstruct @@ -170,7 +170,7 @@ if sys.platform=='win32': if env['CC'] in ['cl', 'cl.exe']: platform = 'win64-vc' if bitness == 64 else 'win32-vc' elif env['CC'] in ['gcc']: - platform = 'win32-mingw' + platform = 'win64-mingw' if bitness == 64 else 'win32-mingw' env.SConscriptChdir(0) @@ -782,6 +782,34 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls +if env['OURPLATFORM'] == 'win64-mingw': + dllsources = [] + + if env['WITH_BF_PYTHON']: + if env['BF_DEBUG']: + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll') + else: + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll') + + if env['WITH_BF_FFMPEG']: + dllsources += env['BF_FFMPEG_DLL'].split() + + if env['WITH_BF_OPENAL']: + dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') + dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') + + if env['WITH_BF_SNDFILE']: + dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') + + if env['WITH_BF_SDL']: + dllsources.append('${LCGDIR}/sdl/lib/SDL.dll') + + dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll') + dllsources.append('#source/icons/blender.exe.manifest') + + windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) + allinstall += windlls + installtarget = env.Alias('install', allinstall) bininstalltarget = env.Alias('install-bin', blenderinstall) -- cgit v1.2.3