X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=1f26ef2114fcddd30443fffcf85f61546fd08d49;hb=2da4a703da966708bb2e2bd4115ee9c348397667;hp=b1a289344fb1ded6d3f79594012e2c0be68adb64;hpb=d4a367800a3abe5e9d88ab58062880e06ab3f5d2;p=yaz-moved-to-github.git diff --git a/win/makefile b/win/makefile index b1a2893..1f26ef2 100644 --- a/win/makefile +++ b/win/makefile @@ -1,8 +1,5 @@ # This file is part of the YAZ toolkit. -# Copyright (C) 1995-2009 Index Data -# -# Programmed by -# Heikki Levanto & Adam Dickmeiss +# Copyright (C) 1995-2010 Index Data # Parameters @@ -91,15 +88,15 @@ TMP=$(TMPDIR) # Targets - what to make !if $(DEBUG) -YAZ_DLL=$(BINDIR)\yaz3d.dll -YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib -YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll -YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib +YAZ_DLL=$(BINDIR)\yaz4d.dll +YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib +YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll +YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib !else -YAZ_DLL=$(BINDIR)\yaz3.dll -YAZ_IMPLIB=$(LIBDIR)\yaz3.lib -YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll -YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib +YAZ_DLL=$(BINDIR)\yaz4.dll +YAZ_IMPLIB=$(LIBDIR)\yaz4.lib +YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll +YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib !endif CLIENT=$(BINDIR)\yaz-client.exe @@ -499,6 +496,7 @@ MISC_OBJS= \ $(OBJDIR)\iconv_decode_iso5426.obj \ $(OBJDIR)\iconv_decode_danmarc.obj \ $(OBJDIR)\mutex.obj \ + $(OBJDIR)\json.obj \ $(OBJDIR)\sc.obj Z3950_OBJS= \