X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=ac0bb562fd39404795e3cf903d1ed1333d78d87c;hb=a8767b7f9a59905fbb94ddbdf1848d629db3bb62;hp=aebf0927e48a87c6895b7e231581f22fefa428ca;hpb=c7ce18b91b4b542af4f02ad9fa3f86f12b92f3d1;p=pazpar2-moved-to-github.git diff --git a/win/makefile b/win/makefile index aebf092..ac0bb56 100644 --- a/win/makefile +++ b/win/makefile @@ -1,10 +1,11 @@ # This file is part of Pazpar2. -# Copyright (C) 2006-2012 Index Data +# Copyright (C) Index Data +# See the file LICENSE for details. DEBUG=0 # 0 for release, 1 for debug USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008 PACKAGE_NAME=pazpar2 -PACKAGE_VERSION=1.6.7 +PACKAGE_VERSION=1.7.4 # YAZ YAZ_DIR=..\..\yaz @@ -59,19 +60,19 @@ pazpar2: $(PAZPAR2_EXE) YAZBINDIR=$(YAZ_DIR)\bin !if $(DEBUG) -YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz5d.lib" "$(YAZ_DIR)\lib\yaz_cond5d.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5d.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll" !else -YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib" +YAZ_LIB="$(YAZ_DIR)\lib\yaz5.lib" "$(YAZ_DIR)\lib\yaz_cond5.lib" !if $(HAVE_ICU) -YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib" +YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5.lib" !endif -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll" !endif YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include" @@ -178,8 +179,6 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) # Source and object modules PAZPAR2_OBJS = \ - "$(OBJDIR)\getaddrinfo.obj" \ - "$(OBJDIR)\host.obj" \ "$(OBJDIR)\pazpar2.obj" \ "$(OBJDIR)\pazpar2_config.obj" \ "$(OBJDIR)\http.obj" \