From caf067576e12f42272a73455353455bd264921f7 Mon Sep 17 00:00:00 2001
From: Tom Musgrove <LetterRip@gmail.com>
Date: Sat, 30 Jan 2010 22:46:25 +0000
Subject: changes to get MingW compiling and cross compiling working, patch by
 Sergey Sharybin

---
 SConstruct | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'SConstruct')

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')
-- 
cgit v1.2.3