diff options
author | Xuan Bai <xuanbai@hdfgroup.org> | 2005-02-07 23:59:28 (GMT) |
---|---|---|
committer | Xuan Bai <xuanbai@hdfgroup.org> | 2005-02-07 23:59:28 (GMT) |
commit | c155ffe2fca107039074e9416b2cdfdc983cde2f (patch) | |
tree | 6a444fa0d7b889a89619c75764478c8387d14119 | |
parent | 74bfe972b557c028eb867b075bea39975b5081e9 (diff) | |
download | hdf5-c155ffe2fca107039074e9416b2cdfdc983cde2f.zip hdf5-c155ffe2fca107039074e9416b2cdfdc983cde2f.tar.gz hdf5-c155ffe2fca107039074e9416b2cdfdc983cde2f.tar.bz2 |
[svn-r9954] Purpose:
New feature.
Description:
Previously, HDF5 static tools were linked with Zlib 1.1.4 and Szip 1.2 static library. We decided to link HDF5 with Zlib 1.2.2 and Szip 2.0 DLL libraries.
Solution:
As now HDF5 only links with Zlib and Szip DLL libraries, only 2 environment variables are needed as described before:
Environment Variables for HDF5 on Windows
Previously Now
HDF5_EXT_ZLIB = zlib.lib HDF5_EXT_ZLIB = zdll.lib
HDF5_EXT_SZIP = szlib.lib HDF5_EXT_SZIP = szlibdll.lib
HDF5_EXT_ZLIB_DLL = c:\zlib114\dll\zlib.lib N/A
HDF5_EXT_SZIP_DLL = szlibdll.lib N/A
Due to the above change, the following changes are made:
1. hdf_dll and dsets_dll were linked with HDF5_EXT_ZLIB_DLL and HDF5_EXT_SZIP_DLL before this update. Now they are linked with HDF5_EXT_ZLIB and HDF5_EXT_SZIP.
2. In hdf5/tools/dumptest.bat and repacktest.bat, HDF5_EXT_ZLIB was compared with zlib.lib and HDF5_EXT_SZIP was compared with szlib.lib to find out whether ZLIB or SZIP libraries were presented. Now HDF5_EXT_ZLIB is compared with zdll.lib and HDF5_EXT_SZIP with szlibdll.lib.
Platforms tested:
Visual C++ 6.0 on Windows 2000/XP.
.NET on XP.
Misc. update:
-rwxr-xr-x | windows/all.zip | bin | 466956 -> 467021 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/windows/all.zip b/windows/all.zip Binary files differindex d5bdeb1..566b971 100755 --- a/windows/all.zip +++ b/windows/all.zip |