From 706926fddf81a2b92fa76cfc4898cd234aa7cdbc Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Mon, 27 Nov 2017 18:17:38 +0100 Subject: Fix ICU library filenames on Windows/MSVC Fixes bug 790119. --- win32/Makefile.msvc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 38e7546b..8a04288a 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -70,7 +70,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib LIBS = $(LIBS) iconv.lib !endif !if "$(WITH_ICU)" == "1" -LIBS = $(LIBS) icu.lib +!if "$(STATIC)" == "1" +LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib +!else +LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib +!endif !endif !if "$(WITH_ZLIB)" == "1" # could be named differently zdll or zlib -- cgit v1.2.1