diff options
| author | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 22:17:47 +0300 |
|---|---|---|
| committer | Tom Musgrove <LetterRip@gmail.com> | 2010-02-01 22:17:47 +0300 |
| commit | 676cc6d6c81fa52cb1dac4b6907eee2a996803b4 (patch) | |
| tree | df01d7d7589fe1d6da37b6057e5fd392b4d4d930 /SConstruct | |
| parent | e15d6fa1df7c7ec025ce820fbe833b4e53b0e572 (diff) | |
libpng.dll is not included in our libs on win64
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 837edb94d86..bb33e69e137 100644 --- a/SConstruct +++ b/SConstruct @@ -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': |