diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af111c27f4f..371b7eb0896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -723,11 +723,7 @@ elseif(WIN32) set(GETTEXT_LIBRARIES gnu_gettext) endif() - if(CMAKE_CL_64) - set(PNG_LIBRARIES libpng) - else() - set(PNG_LIBRARIES libpng_st) - endif() + set(PNG_LIBRARIES libpng) set(JPEG_LIBRARIES libjpeg) set(PNG "${LIBDIR}/png") diff --git a/SConstruct b/SConstruct index d8db597d1c6..1a038278404 100644 --- a/SConstruct +++ b/SConstruct @@ -726,10 +726,6 @@ 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'] - #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'] # Used when linking to libtiff was dynamic # keep it here until compilation on all platform would be ok diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index a2e3d11c244..53ac9937885 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -72,7 +72,7 @@ BF_JPEG_LIBPATH = '${BF_JPEG}/lib' WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' -BF_PNG_LIB = 'libpng_st' +BF_PNG_LIB = 'libpng' BF_PNG_LIBPATH = '${BF_PNG}/lib' WITH_BF_TIFF = True diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 79a7f5bd910..6851b783463 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -491,7 +491,6 @@ elseif(WIN32) else() install( FILES - ${LIBDIR}/png/lib/libpng.dll ${LIBDIR}/zlib/lib/zlib.dll DESTINATION ${TARGETDIR} ) |