From: Adam Dickmeiss Date: Fri, 12 Dec 2014 13:00:25 +0000 (+0100) Subject: Nmake: move ICU_VER to top X-Git-Tag: v5.7.2~2 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=652b518dd2393b9ab6bafaf384ca3bbd8a746f18;p=yaz-moved-to-github.git Nmake: move ICU_VER to top --- diff --git a/win/makefile b/win/makefile index d04f932..0fcceb1 100644 --- a/win/makefile +++ b/win/makefile @@ -18,6 +18,7 @@ ICONV_DIR = c:\iconv-1.9.2.win32 # icu charcter conversion utility # get icu libraries from http://www.icu-project.org HAVE_ICU=1 +ICU_VER=54 ICU_LIB = c:\icu\lib ICU_BIN = c:\icu\bin ICU_INCLUDE = c:\icu\include @@ -191,7 +192,6 @@ iconv: !if $(HAVE_ICU) ICU_DEF= \ /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)" -ICU_VER=54 ICU_LIBS= \ $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib icu: $(BINDIR)\icudt$(ICU_VER).dll \