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
Completes. But still wrong tests
[pazpar2-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
7395065
..
d8031c9
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,10
+1,10
@@
# This file is part of Pazpar2.
# This file is part of Pazpar2.
-# Copyright (C) 2006-2009 Index Data
+# Copyright (C) 2006-2012 Index Data
DEBUG=0 # 0 for release, 1 for debug
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
+USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
PACKAGE_NAME=pazpar2
PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.2.2
+PACKAGE_VERSION=1.6.21
# YAZ
YAZ_DIR=..\..\yaz
# YAZ
YAZ_DIR=..\..\yaz
@@
-12,8
+12,8
@@
YAZ_DIR=..\..\yaz
# Libxml2 + libxslt + associates
ZLIB_DIR=\zlib-1.2.3.win32
ICONV_DIR=\iconv-1.9.2.win32
# Libxml2 + libxslt + associates
ZLIB_DIR=\zlib-1.2.3.win32
ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.7.1.win32
-LIBXSLT_DIR=\libxslt-1.1.24.win32
+LIBXML2_DIR=\libxml2-2.7.6.win32
+LIBXSLT_DIR=\libxslt-1.1.26.win32
# ICU
HAVE_ICU=1
# ICU
HAVE_ICU=1
@@
-59,19
+59,19
@@
pazpar2: $(PAZPAR2_EXE)
YAZBINDIR=$(YAZ_DIR)\bin
!if $(DEBUG)
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)
!if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3d.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib"
!endif
!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
!else
-YAZ_LIB="$(YAZ_DIR)\lib\yaz3.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib"
!if $(HAVE_ICU)
!if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu3.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib"
!endif
!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"
!endif
YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
@@
-178,30
+178,34
@@
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
# Source and object modules
PAZPAR2_OBJS = \
# Source and object modules
PAZPAR2_OBJS = \
+ "$(OBJDIR)\getaddrinfo.obj" \
+ "$(OBJDIR)\host.obj" \
"$(OBJDIR)\pazpar2.obj" \
"$(OBJDIR)\pazpar2_config.obj" \
"$(OBJDIR)\http.obj" \
"$(OBJDIR)\eventl.obj" \
"$(OBJDIR)\http_command.obj" \
"$(OBJDIR)\pazpar2.obj" \
"$(OBJDIR)\pazpar2_config.obj" \
"$(OBJDIR)\http.obj" \
"$(OBJDIR)\eventl.obj" \
"$(OBJDIR)\http_command.obj" \
- "$(OBJDIR)\logic.obj" \
+ "$(OBJDIR)\session.obj" \
"$(OBJDIR)\record.obj" \
"$(OBJDIR)\reclists.obj" \
"$(OBJDIR)\relevance.obj" \
"$(OBJDIR)\termlists.obj" \
"$(OBJDIR)\normalize7bit.obj" \
"$(OBJDIR)\record.obj" \
"$(OBJDIR)\reclists.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)\charsets.obj" \
"$(OBJDIR)\client.obj" \
- "$(OBJDIR)\dirent.obj" \
"$(OBJDIR)\jenkins_hash.obj" \
"$(OBJDIR)\marcmap.obj" \
"$(OBJDIR)\marchash.obj" \
"$(OBJDIR)\normalize_record.obj" \
"$(OBJDIR)\normalize_cache.obj" \
"$(OBJDIR)\jenkins_hash.obj" \
"$(OBJDIR)\marcmap.obj" \
"$(OBJDIR)\marchash.obj" \
"$(OBJDIR)\normalize_record.obj" \
"$(OBJDIR)\normalize_cache.obj" \
- "$(OBJDIR)\connection.obj"
+ "$(OBJDIR)\ppmutex.obj" \
+ "$(OBJDIR)\incref.obj" \
+ "$(OBJDIR)\sel_thread.obj" \
+ "$(OBJDIR)\service_xslt.obj" \
+ "$(OBJDIR)\connection.obj" \
+ "$(OBJDIR)\facet_limit.obj"
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
{$(SRCDIR)}.c{$(OBJDIR)}.obj: