From fe1706e797033af0411ce0db793f51c90078d21e Mon Sep 17 00:00:00 2001 From: Ashish Kulkarni Date: Wed, 17 Dec 2014 18:13:20 +0530 Subject: WTF: fix build on Windows for static ICU The logic used was changed to be in sync with that used for the configuration tests. Change-Id: I8ba654c85487c19144431a94c2337caebac60447 Reviewed-by: Kai Koehne Reviewed-by: Allan Sandfeld Jensen --- Source/WTF/WTF.pri | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 696e4962e..bb130f6a4 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -14,7 +14,17 @@ mac { INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH LIBS += -licucore } else:!use?(wchar_unicode): { - win32: LIBS += -licuin -licuuc -licudt + win32 { + CONFIG(static, static|shared) { + CONFIG(debug, debug|release) { + LIBS += -lsicuind -lsicuucd -lsicudtd + } else { + LIBS += -lsicuin -lsicuuc -lsicudt + } + } else { + LIBS += -licuin -licuuc -licudt + } + } else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n else:android: LIBS += -licui18n -licuuc else: LIBS += -licui18n -licuuc -licudata -- cgit v1.2.3