changes to get MingW compiling and cross compiling working, patch by Sergey Sharybin
authorTom Musgrove <LetterRip@gmail.com>
Sat, 30 Jan 2010 22:46:25 +0000 (22:46 +0000)
committerTom Musgrove <LetterRip@gmail.com>
Sat, 30 Jan 2010 22:46:25 +0000 (22:46 +0000)
SConstruct
config/win32-mingw-config.py

index c56ee99bb80757e255cb75a20ebb765b79c116d5..354915541b89a6e42defdc43aa38479626d9ae9e 100644 (file)
@@ -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')
index 00c70aaaf1fe76862cecef2aa3e42897c644dc3b..987d3694873ee4680643fe7daba5e6a9853e6838 100644 (file)
@@ -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