diff options
| author | Tom Musgrove <LetterRip@gmail.com> | 2010-01-31 01:46:25 +0300 |
|---|---|---|
| committer | Tom Musgrove <LetterRip@gmail.com> | 2010-01-31 01:46:25 +0300 |
| commit | caf067576e12f42272a73455353455bd264921f7 (patch) | |
| tree | dd8c739a8040a4fc21703947de36c18121e6b0a7 | |
| parent | f749d0361f8a2cf8ba7d515c31cec1dcf8fe96a5 (diff) | |
changes to get MingW compiling and cross compiling working, patch by Sergey Sharybin
| -rw-r--r-- | SConstruct | 16 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 10 |
2 files changed, 18 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index c56ee99bb80..354915541b8 100644 --- a/SConstruct +++ b/SConstruct @@ -578,11 +578,14 @@ else: allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): - if env['OURPLATFORM'] == 'win64-vc': - dllsources = [] - else: - dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', - '${BF_PNG_LIBPATH}/libpng.dll', + dllsources = [] + + if env['OURPLATFORM'] != 'win64-vc': + if env['OURPLATFORM'] != 'win32-mingw': + # For MinGW static linking will be used + dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll'] + + dllsources += ['${BF_PNG_LIBPATH}/libpng.dll', '${BF_ZLIB_LIBPATH}/zlib.dll', '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] @@ -599,7 +602,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): if env['WITH_BF_ICONV']: if env['OURPLATFORM'] == 'win64-vc': pass # we link statically to iconv on win64 - else: + elif env['OURPLATFORM'] != 'win32-mingw': + #gettext for MinGW is compiled staticly dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll'] if env['WITH_BF_OPENAL']: dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 00c70aaaf1f..987d3694873 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -85,11 +85,17 @@ BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' WITH_BF_INTERNATIONAL = True -BF_GETTEXT = LIBDIR + '/gettext' +BF_GETTEXT = LIBDIR + '/gcc/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' -BF_GETTEXT_LIB = 'gnu_gettext' +BF_GETTEXT_LIB = 'intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' +WITH_BF_FFTW3 = False +BF_FFTW3 = LIBDIR + '/gcc/fftw3' +BF_FFTW3_INC = '${BF_FFTW3}/include' +BF_FFTW3_LIB = 'fftw3' +BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' + WITH_BF_GAMEENGINE = False WITH_BF_PLAYER = False |