X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=b82ddf4e7710f077c39ac53dd97db2691402e285;hp=d04f932747a31f2ac13576d8fd9738f0c1436b84;hb=dca8928db421aa8750ac9ffead1a5c09a85f4f8b;hpb=34886b048134b852abade14b9e535ac90f00093d diff --git a/win/makefile b/win/makefile index d04f932..b82ddf4 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 @@ -42,7 +43,7 @@ default: all all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \ testprog iconv icu libxml2 libxslt yaz_url -allj: all +allj: all yaz4j NSIS="c:\program files (x86)\nsis\makensis.exe" HHC="c:\program files (x86)\html help workshop\hhc.exe" @@ -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 \