[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57191] trunk/lib/windows/zlib: Recompile z-lib with deflate_copyright marked as static

Sergey Sharybin sergey.vfx at gmail.com
Sun Jun 2 16:56:04 CEST 2013


Revision: 57191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57191
Author:   nazgul
Date:     2013-06-02 14:56:04 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
Recompile z-lib with deflate_copyright marked as static

This is an essential change to make next commit working.
Without this change deflate_copyright would conflict with
one defined in OpenEXR library.

This symbol is actually marked as local in the map file,
so maybe proper solution would be to make MSVC aware of
this map file, but not sure whether it's possible or not.

Modified Paths:
--------------
    trunk/lib/windows/zlib/lib/libz.lib
    trunk/lib/windows/zlib/lib/libz_st.lib
    trunk/lib/windows/zlib/lib/zlib.dll
    trunk/lib/windows/zlib/lib/zlib.lib
    trunk/lib/windows/zlib/readme.txt

Modified: trunk/lib/windows/zlib/lib/libz.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/zlib/lib/libz_st.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/zlib/lib/zlib.dll
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/zlib/lib/zlib.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows/zlib/readme.txt
===================================================================
--- trunk/lib/windows/zlib/readme.txt	2013-06-02 14:52:29 UTC (rev 57190)
+++ trunk/lib/windows/zlib/readme.txt	2013-06-02 14:56:04 UTC (rev 57191)
@@ -3,6 +3,7 @@
 
 * Download zlib 1.2.8
 * In lib/windows/zlib/zlib-1.2.8
+* make deflate_copyright a static variable in deflate.c
 * Open Visual Studio 2008 Command Prompt
 * cd into lib/windows/zlib
 * build.bat




More information about the Bf-blender-cvs mailing list