From f4a27ab8e11b893f3f25105d25c3fc5cb3dccbe8 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 12 Dec 2014 14:01:23 +0100 Subject: [PATCH] nmake: ICU tuning to top of makefile --- win/makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/win/makefile b/win/makefile index 0eb4cca..4be18db 100644 --- a/win/makefile +++ b/win/makefile @@ -17,6 +17,8 @@ LIBXSLT_DIR=\libxslt-1.1.28.win32 # ICU HAVE_ICU=1 ICU_DIR=c:\icu +ICU_LIB=$(ICU_DIR)\lib +ICU_INCLUDE=$(ICU_DIR)\include default: all @@ -92,13 +94,13 @@ LIBXSLT_LIB = \ "$(LIBXSLT_DIR)\lib\libxslt.lib" !if $(HAVE_ICU) -ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_DIR)\include" -ICU_LIB= $(ICU_DIR)\lib\icudt.lib \ - $(ICU_DIR)\lib\icuin.lib \ - $(ICU_DIR)\lib64\icuuc.lib +ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_INCLUDE)" +ICU_LIBS= $(ICU_LIB)\icudt.lib \ + $(ICU_LIB)\icuin.lib \ + $(ICU_LIB)\icuuc.lib !else ICU_DEF=/DYAZ_HAVE_ICU=0 -ICU_LIB= +ICU_LIBS= !endif COMMON_C_OPTIONS= \ @@ -148,7 +150,7 @@ RELEASE_C_OPTIONS= \ LINK=link.exe LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \ - $(YAZ_LIB) $(ICU_LIB) $(LIBXSLT_LIB) + $(YAZ_LIB) $(ICU_LIBS) $(LIBXSLT_LIB) COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no -- 1.7.10.4