Revision: 26460
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26460
Author: letterrip
Date: 2010-01-30 23:46:25 +0100 (Sat, 30 Jan 2010)
Log Message:
-----------
changes to get MingW compiling and cross compiling working, patch by Sergey
Sharybin
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/config/win32-mingw-config.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2010-01-30 22:44:12 UTC (rev 26459)
+++ trunk/blender/SConstruct 2010-01-30 22:46:25 UTC (rev 26460)
@@ -578,11 +578,14 @@
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['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')
Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py 2010-01-30 22:44:12 UTC (rev
26459)
+++ trunk/blender/config/win32-mingw-config.py 2010-01-30 22:46:25 UTC (rev
26460)
@@ -85,11 +85,17 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
