X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=daf37a555be82d520c21b1d85675877bb122664f;hb=975af84a25e086c3063390e03ff620beb2981b52;hp=e81146780880b50f5d3a1f245811a2d8077b5e4c;hpb=dc286aaa1e04edef59f6d2f78b805ff34c4e48d9;p=pazpar2-moved-to-github.git diff --git a/win/makefile b/win/makefile index e811467..daf37a5 100644 --- a/win/makefile +++ b/win/makefile @@ -1,10 +1,11 @@ # This file is part of Pazpar2. -# Copyright (C) 2006-2010 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.4.4 +PACKAGE_VERSION=1.6.43 # 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,6 +179,8 @@ 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" \ @@ -189,10 +192,8 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\relevance.obj" \ "$(OBJDIR)\termlists.obj" \ "$(OBJDIR)\normalize7bit.obj" \ - "$(OBJDIR)\zeerex.obj" \ "$(OBJDIR)\database.obj" \ "$(OBJDIR)\settings.obj" \ - "$(OBJDIR)\getaddrinfo.obj" \ "$(OBJDIR)\charsets.obj" \ "$(OBJDIR)\client.obj" \ "$(OBJDIR)\jenkins_hash.obj" \ @@ -203,7 +204,9 @@ PAZPAR2_OBJS = \ "$(OBJDIR)\ppmutex.obj" \ "$(OBJDIR)\incref.obj" \ "$(OBJDIR)\sel_thread.obj" \ - "$(OBJDIR)\connection.obj" + "$(OBJDIR)\service_xslt.obj" \ + "$(OBJDIR)\connection.obj" \ + "$(OBJDIR)\facet_limit.obj" {$(SRCDIR)}.c{$(OBJDIR)}.obj: