* Changes for static win32 png libs.
authorThomas Dinges <blender@dingto.org>
Mon, 19 Dec 2011 19:46:07 +0000 (19:46 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 19 Dec 2011 19:46:07 +0000 (19:46 +0000)
CMakeLists.txt
SConstruct
build_files/scons/config/win32-vc-config.py
source/creator/CMakeLists.txt

index af111c27f4fabf734490ebef7e84f4fe9fba3b58..371b7eb089680b3206754e9e2c8ef190c715a283 100644 (file)
@@ -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")
index d8db597d1c6d956081cb913c5c985816e61a3b43..1a03827840461a2e5cdbc34d4807691a91245fea 100644 (file)
@@ -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
index a2e3d11c244a09b2a1597b0eae8686faf6dc77a5..53ac9937885c5a66d913142a8bdc12c8f866a3d8 100644 (file)
@@ -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
index 79a7f5bd910e866a54dd7e083a522478da5c097a..6851b783463c95518c8ca75b7211bc88676a4196 100644 (file)
@@ -491,7 +491,6 @@ elseif(WIN32)
        else()
                install(
                        FILES
-                               ${LIBDIR}/png/lib/libpng.dll
                                ${LIBDIR}/zlib/lib/zlib.dll
                        DESTINATION ${TARGETDIR}
                )