4b7f8f7cf3
Change-Id: I53eb6ed41fb8a17a79f72807df15822e9c1c6e88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124290 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
16 lines
610 B
Groff
16 lines
610 B
Groff
find internal zlib in nmake buildsystem
|
|
|
|
--- curl/winbuild/MakefileBuild.vc.orig2 2021-10-27 20:44:48.685237000 +0200
|
|
+++ curl/winbuild/MakefileBuild.vc 2021-10-27 20:47:23.792407400 +0200
|
|
@@ -222,8 +222,9 @@
|
|
ZLIB_LIB_DIR = $(ZLIB_PATH)\lib
|
|
ZLIB_LFLAGS = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)"
|
|
!ELSE
|
|
-ZLIB_INC_DIR = $(DEVEL_INCLUDE)
|
|
-ZLIB_LIB_DIR = $(DEVEL_LIB)
|
|
+ZLIB_INC_DIR = $(WORKDIR)/UnpackedTarball/zlib
|
|
+ZLIB_LIB_DIR = $(WORKDIR)/LinkTarget/StaticLibrary
|
|
+ZLIB_LFLAGS = $(ZLIB_LFLAGS) "/LIBPATH:$(ZLIB_LIB_DIR)"
|
|
!ENDIF
|
|
|
|
# Depending on how zlib is built the libraries have different names, we
|