diff --git a/.gitattributes b/.gitattributes index 45407cab1f2..9461f076168 100644 --- a/.gitattributes +++ b/.gitattributes @@ -503,6 +503,7 @@ Installation/config/support/S25-MPFR -text Installation/config/support/S30-CORE -text Installation/config/support/S32-CGALCORE -text Installation/config/support/S40-ZLIB -text +Installation/config/support/S40-ZLIBMS -text Installation/config/support/S60-LEDA -text Installation/config/support/S62-LEDAMS -text Installation/config/support/S80-QT3MT -text diff --git a/Installation/config/support/S40-ZLIB b/Installation/config/support/S40-ZLIB index f0e1e7f7f70..11e28a4eaf3 100755 --- a/Installation/config/support/S40-ZLIB +++ b/Installation/config/support/S40-ZLIB @@ -1,15 +1,15 @@ -# The ZLIB library (http://www.gzlib.org/zlib) +# The ZLIB library -DESCRIPTION = ZLIB library for Windows +DESCRIPTION = ZLIB library PROVIDES = ZLIB CXXFLAGS = LDFLAGS = -LIBS = zdll -REQUIRES = DOLLAR_WINDOWS_COMPILER -INCOMPATIBLE = -STDINCLDIRS = zlib.h -INCLTHING = boost +LIBS = z +REQUIRES = +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +STDINCLDIRS = +INCLTHING = STDLIBDIRS = -LIBTHING = zdll.lib +LIBTHING = libz.\* # EOF diff --git a/Installation/config/support/S40-ZLIBMS b/Installation/config/support/S40-ZLIBMS new file mode 100755 index 00000000000..517c8ed3281 --- /dev/null +++ b/Installation/config/support/S40-ZLIBMS @@ -0,0 +1,15 @@ +# The ZLIB library (http://www.gzlib.org/zlib) + +DESCRIPTION = ZLIB library for Windows +PROVIDES = ZLIB +CXXFLAGS = +LDFLAGS = +LIBS = zdll +REQUIRES = DOLLAR_WINDOWS_COMPILER +INCOMPATIBLE = +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = zdll.lib + +# EOF