[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19066] branches/blender2.5/blender/ SConstruct: 2.5 - Fixed compiling for scons + mingw

[Joshua Leung]

Revision: 19066
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19066
Author:   aligorith
Date:     2009-02-21 04:26:03 +0100 (Sat, 21 Feb 2009)

Log Message:
-----------
2.5 - Fixed compiling for scons + mingw 

jesterKing: please check on this, since it seems to be basic typos only? See my mail to the list for details of the error. 

Modified Paths:
--------------
    branches/blender2.5/blender/SConstruct

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2009-02-21 03:02:39 UTC (rev 19065)
+++ branches/blender2.5/blender/SConstruct	2009-02-21 03:26:03 UTC (rev 19066)
@@ -400,7 +400,8 @@
 thesyslibs = B.setup_syslibs(env)
 
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
-	env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+	#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
@@ -552,7 +553,7 @@
 	if env['OURPLATFORM'] == 'win64-vc':
 		dllsources = []
 	else:
-		dllsources = ['${LCGDIR}/gettext/lib/gettext.dll',
+		dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
 				'${BF_PNG_LIBPATH}/libpng.dll',
 				'${BF_ZLIB_LIBPATH}/zlib.dll',
 				'${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']