diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 20:33:02 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-01 14:25:23 +0200 |
| commit | 88a86014d90de0e59c494fbdb354d5fe1fba55a4 (patch) | |
| tree | 8433542c3a59243ad3c44d27d9b3347f621aea06 /configure.ac | |
| parent | zlib: upgrade to release 1.2.12 (diff) | |
| download | core-88a86014d90de0e59c494fbdb354d5fe1fba55a4.tar.gz core-88a86014d90de0e59c494fbdb354d5fe1fba55a4.zip | |
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132423
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a072505f5f44..7b09dc9b3244 100644 --- a/configure.ac +++ b/configure.ac @@ -8098,7 +8098,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) |