X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=b1a289344fb1ded6d3f79594012e2c0be68adb64;hp=e2e0fa84033493d552075565653cf317934627a3;hb=d4a367800a3abe5e9d88ab58062880e06ab3f5d2;hpb=7996f8a4fcb85b0b7d5e8fad636e240904707a90 diff --git a/win/makefile b/win/makefile index e2e0fa8..b1a2893 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 @@ -544,7 +544,13 @@ DLL_OBJS =\ $(ILL_OBJS) \ ICU_DLL_OBJS =\ - $(OBJDIR)\icu_I18N.obj + $(OBJDIR)\icu_chain.obj \ + $(OBJDIR)\icu_utf16.obj \ + $(OBJDIR)\icu_utf8.obj \ + $(OBJDIR)\icu_transform.obj \ + $(OBJDIR)\icu_casemap.obj \ + $(OBJDIR)\icu_tokenizer.obj \ + $(OBJDIR)\icu_sortkey.obj # Generated C and H files