projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into paz-927
[pazpar2-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
ef231b5
..
dbbaf5e
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,10
+1,11
@@
# This file is part of Pazpar2.
# 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
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.2
+PACKAGE_VERSION=1.6.40
# YAZ
YAZ_DIR=..\..\yaz
# YAZ
YAZ_DIR=..\..\yaz
@@
-59,19
+60,19
@@
pazpar2: $(PAZPAR2_EXE)
YAZBINDIR=$(YAZ_DIR)\bin
!if $(DEBUG)
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)
!if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5d.lib"
!endif
!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
!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)
!if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5.lib"
!endif
!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"
!endif
YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
@@
-189,10
+190,8
@@
PAZPAR2_OBJS = \
"$(OBJDIR)\relevance.obj" \
"$(OBJDIR)\termlists.obj" \
"$(OBJDIR)\normalize7bit.obj" \
"$(OBJDIR)\relevance.obj" \
"$(OBJDIR)\termlists.obj" \
"$(OBJDIR)\normalize7bit.obj" \
- "$(OBJDIR)\zeerex.obj" \
"$(OBJDIR)\database.obj" \
"$(OBJDIR)\settings.obj" \
"$(OBJDIR)\database.obj" \
"$(OBJDIR)\settings.obj" \
- "$(OBJDIR)\getaddrinfo.obj" \
"$(OBJDIR)\charsets.obj" \
"$(OBJDIR)\client.obj" \
"$(OBJDIR)\jenkins_hash.obj" \
"$(OBJDIR)\charsets.obj" \
"$(OBJDIR)\client.obj" \
"$(OBJDIR)\jenkins_hash.obj" \
@@
-203,7
+202,9
@@
PAZPAR2_OBJS = \
"$(OBJDIR)\ppmutex.obj" \
"$(OBJDIR)\incref.obj" \
"$(OBJDIR)\sel_thread.obj" \
"$(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:
{$(SRCDIR)}.c{$(OBJDIR)}.obj: