From 5f3c82fbbf6f405e88a9f4ea15e91065d4fb5d88 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 20 Sep 2008 18:07:32 +0200 Subject: [PATCH] Windows makefile - added mutex.obj and updated for ICU 4.0 --- win/makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/win/makefile b/win/makefile index b170a1d..9de4ef9 100644 --- a/win/makefile +++ b/win/makefile @@ -174,15 +174,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)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll +icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll yazicu: dirs generate $(YAZ_ICU) -$(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) +$(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= \ /D YAZ_HAVE_ICU=0 @@ -495,6 +495,7 @@ MISC_OBJS= \ $(OBJDIR)\iconv_encode_marc8.obj \ $(OBJDIR)\iconv_decode_marc8.obj \ $(OBJDIR)\iconv_encode_wchar.obj \ + $(OBJDIR)\mutex.obj \ $(OBJDIR)\sc.obj Z3950_OBJS= \ -- 1.7.10.4