X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=win%2Fmakefile;h=5f814f2054052823069d85b9a186ca0570c9e3ca;hb=65ab4e7f2c79f68334ae7334883c3f9999dc6bd2;hp=934bcb32cec1e1361378443f2234cb15edbad13f;hpb=ca9817524ebe069581ad72f6bca0e9775d61e30c;p=pazpar2-moved-to-github.git diff --git a/win/makefile b/win/makefile index 934bcb3..5f814f2 100644 --- a/win/makefile +++ b/win/makefile @@ -59,19 +59,19 @@ pazpar2: $(PAZPAR2_EXE) YAZBINDIR=$(YAZ_DIR)\bin !if $(DEBUG) -YAZ_LIB="$(YAZ_DIR)\lib\yaz3d.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3d.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll" !else -YAZ_LIB="$(YAZ_DIR)\lib\yaz3.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll" !endif YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include" @@ -200,6 +200,8 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\marchash.obj" \ "$(OBJDIR)\normalize_record.obj" \ "$(OBJDIR)\normalize_cache.obj" \ + "$(OBJDIR)\ppmutex.obj" \ + "$(OBJDIR)\incref.obj" \ "$(OBJDIR)\connection.obj"