Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

changes to get MingW compiling and cross compiling working, patch by Sergey Sharybin

Browse Source
This commit is contained in:
Tom Musgrove
2010-01-30 22:46:25 +00:00
parent f749d0361f
commit caf067576e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SConstruct
View File

@@ -578,11 +578,14 @@ else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
if env['OURPLATFORM'] == 'win64-vc': dllsources = []
dllsources = []
else: if env['OURPLATFORM'] != 'win64-vc':
dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', if env['OURPLATFORM'] != 'win32-mingw':
'${BF_PNG_LIBPATH}/libpng.dll', # 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_ZLIB_LIBPATH}/zlib.dll',
'${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_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['WITH_BF_ICONV']:
if env['OURPLATFORM'] == 'win64-vc': if env['OURPLATFORM'] == 'win64-vc':
pass # we link statically to iconv on win64 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'] dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
if env['WITH_BF_OPENAL']: if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')

10
config/win32-mingw-config.py
View File

@@ -85,11 +85,17 @@ BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True WITH_BF_INTERNATIONAL = True
BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT = LIBDIR + '/gcc/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIB = 'intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' 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_GAMEENGINE = False
WITH_BF_PLAYER = False WITH_BF_PLAYER = False