[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26529] trunk/blender/SConstruct: libpng. dll is not included in our libs on win64

[Tom Musgrove]

Revision: 26529
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26529
Author:   letterrip
Date:     2010-02-01 20:17:47 +0100 (Mon, 01 Feb 2010)

Log Message:
-----------
libpng.dll is not included in our libs on win64

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-01 19:01:57 UTC (rev 26528)
+++ trunk/blender/SConstruct	2010-02-01 19:17:47 UTC (rev 26529)
@@ -590,8 +590,11 @@
 		# For MinGW and linuxcross static linking will be used
 		dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
 
-	dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
-			'${BF_ZLIB_LIBPATH}/zlib.dll',
+	#currently win64-vc doesn't appear to have libpng.dll
+	if env['OURPLATFORM'] != 'win64-vc':
+		dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
+
+	dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll',
 			'${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
 
 	if env['OURPLATFORM'] != 'linuxcross':