Hi, the zlib project's visual studio file creates static libraries named zlibstat.lib by default. Atm SVN supports this, if it determines zlib is in source-layout, but doesn't support it, if it determines files are in install-layout (the detection being based on whether the zlib-path contains an include-directory or not).
I think it would be neat, if SVN could handle also the zlibstat.lib-named library (since it's a default name for the static zlib library on Windows). The attached patch adds that support. [[[ Add support for zlibstat.lib-named zlib static libraries for Windows builds in install-layout. * build/generator/gen_win_dependencies.py (_find_zlib): check for zlibstat.lib, when determining the zlib library name ]]] Regards, Stefan
Index: build/generator/gen_win_dependencies.py
===================================================================
--- build/generator/gen_win_dependencies.py (revision 1781021)
+++ build/generator/gen_win_dependencies.py (working copy)
@@ -707,6 +707,9 @@
if os.path.exists(os.path.join(lib_path, 'zlibstatic.lib')):
# CMake default: zlibstatic.lib (static) and zlib.lib (dll)
lib_name = 'zlibstatic.lib'
+ elif os.path.exists(os.path.join(lib_path, 'zlibstat.lib')):
+ # Visual Studio project file default: zlibstat.lib (static) and
zlibwapi.lib (dll)
+ lib_name = 'zlibstat.lib'
else:
# Standard makefile produces zlib.lib (static) and zdll.lib (dll)
lib_name = 'zlib.lib'
smime.p7s
Description: S/MIME Cryptographic Signature
