Windows port uses newer versions Libxml2/libxslt + ICU.

diff --git a/win/makefile b/win/makefile
index 40cb077..06e8f15 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -17,11 +17,11 @@ ICONV_DIR=c:\iconv-1.9.2.win32
 
 # libxslt. For mod_dom and mod_alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.28.win32
+LIBXML2_DIR=c:\libxml2-2.7.1.win32
 
 # zlib compression.  Used by libxml2
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -200,14 +200,14 @@ libxslt:
 !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)\lib\icuuc.lib
-icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
-
-$(BINDIR)\icudt38.dll:
-         copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
-$(BINDIR)\icuin38.dll:
-         copy "$(ICU_DIR)\bin\icuin38.dll" $(BINDIR)
-$(BINDIR)\icuuc38.dll:
-         copy "$(ICU_DIR)\bin\icuuc38.dll" $(BINDIR)
+icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
+
+$(BINDIR)\icudt40.dll:
+         copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
+$(BINDIR)\icuin40.dll:
+         copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
+$(BINDIR)\icuuc40.dll:
+         copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
 !else
 ICU_DEF=  /DYAZ_HAVE_ICU=0
 ICU_LIB=

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 3bace91..887e0e2 100644 (file)
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -93,9 +93,7 @@ Section "Zebra Runtime"
        File ..\bin\libxslt.dll
        File ..\bin\yaz3.dll
        File ..\bin\libexpat.dll
-       File ..\bin\icudt38.dll
-       File ..\bin\icuin38.dll
-       File ..\bin\icuuc38.dll
+       File ..\bin\icu*.dll
        File ..\bin\yaz_icu3.dll
 SectionEnd