From fc66745b60adb55d6b9f998c0bb9d8f607953e51 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 28 Nov 2009 13:59:53 +0100 Subject: [PATCH] YAZ on Windows uses newer Libxml2/Libxslt, ICU YAZ on Windows uses Libxml2 2.7.6, Libxslt 1.1.24, ICU 4.2. --- win/makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/win/makefile b/win/makefile index e2e0fa8..f6a124f 100644 --- a/win/makefile +++ b/win/makefile @@ -25,11 +25,11 @@ ICU_DIR = c:\icu # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.24.win32 +LIBXSLT_DIR=c:\libxslt-1.1.26.win32 # libxml2 HAVE_LIBXML2=1 -LIBXML2_DIR=c:\libxml2-2.7.1.win32 +LIBXML2_DIR=c:\libxml2-2.7.6.win32 # zlib compression (used by libxml2) ZLIB_DIR = c:\zlib-1.2.3.win32 @@ -172,15 +172,15 @@ ICU_DEF= \ /I"$(ICU_DIR)\include" ICU_LIB= \ $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib -icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll +icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll yazicu: dirs generate $(YAZ_ICU) -$(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) +$(BINDIR)\icudt42.dll: + copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR) +$(BINDIR)\icuin42.dll: + copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR) +$(BINDIR)\icuuc42.dll: + copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR) !else ICU_DEF= \ /D YAZ_HAVE_ICU=0 -- 1.7.10.4