X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=d51b408a7fb904d794435ffb271ebdce47a7e158;hb=HEAD;hp=2d73d8c22ef6d85341c501bc1c42d0b7acaa34c8;hpb=27d70cebc8400fd364453a6bf9445531a66872d9;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 2d73d8c..d51b408 100644
--- a/win/makefile
+++ b/win/makefile
@@ -14,7 +14,7 @@ HAVE_TCL=1
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR=c:\Program files (x86)\Expat 2.0.1
+EXPAT_DIR=c:\Program files (x86)\Expat 2.1.0
 
 # iconv is optional
 HAVE_ICONV=0
@@ -31,8 +31,6 @@ LIBXML2_DIR=c:\libxml2-2.9.2.win32
 # ICU support
 HAVE_ICU=1
 ICU_DIR=c:\icu
-ICU_LIB=$(ICU_DIR)\lib
-ICU_BIN=$(ICU_DIR)\bin
 ICU_INCLUDE=$(ICU_DIR)\include
 
 default: all
@@ -107,10 +105,10 @@ dist:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
 	nmake DEBUG=0
-	$(NSIS) zebra.nsi
+	nmake nsis
 
 nsis:
-	$(NSIS) zebra.nsi
+	$(NSIS) /DVSARCH=x86 /DVSVER=14 zebra.nsi
 
 # Targets - what to make
 
@@ -183,10 +181,8 @@ LIBXSLT_DEF=/D HAVE_XSLT=0
 
 !if $(HAVE_ICU)
 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_LIBS=
+ICU_DEF= /DYAZ_HAVE_ICU=0
 !endif
 
 !if $(HAVE_LIBXSLT)
@@ -275,7 +271,7 @@ MT=echo
 # wsock32.lib  advapi32.lib \
 
 LINK_LIBS= kernel32.lib advapi32.lib \
-	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIBS)
+	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no