[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42736] trunk/blender: * Changes for static win32 png libs.
Thomas Dinges
blender at dingto.org
Mon Dec 19 20:46:08 CET 2011
Revision: 42736
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42736
Author: dingto
Date: 2011-12-19 19:46:07 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
* Changes for static win32 png libs.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/SConstruct
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-12-19 19:45:14 UTC (rev 42735)
+++ trunk/blender/CMakeLists.txt 2011-12-19 19:46:07 UTC (rev 42736)
@@ -723,11 +723,7 @@
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")
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2011-12-19 19:45:14 UTC (rev 42735)
+++ trunk/blender/SConstruct 2011-12-19 19:46:07 UTC (rev 42736)
@@ -726,10 +726,6 @@
# 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
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2011-12-19 19:45:14 UTC (rev 42735)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2011-12-19 19:46:07 UTC (rev 42736)
@@ -72,7 +72,7 @@
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
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-12-19 19:45:14 UTC (rev 42735)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-12-19 19:46:07 UTC (rev 42736)
@@ -491,7 +491,6 @@
else()
install(
FILES
- ${LIBDIR}/png/lib/libpng.dll
${LIBDIR}/zlib/lib/zlib.dll
DESTINATION ${TARGETDIR}
)
More information about the Bf-blender-cvs
mailing list