libpng.dll is not included in our libs on win64
authorTom Musgrove <LetterRip@gmail.com>
Mon, 1 Feb 2010 19:17:47 +0000 (19:17 +0000)
committerTom Musgrove <LetterRip@gmail.com>
Mon, 1 Feb 2010 19:17:47 +0000 (19:17 +0000)
SConstruct

index 837edb94d8601b19d6337d769b723a7da64b6ad4..bb33e69e1376ad30208a6d14142aee74777e150b 100644 (file)
@@ -590,8 +590,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
                # 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':