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
win makefile: use yaz_cond4.dll, incref
[pazpar2-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
934bcb3
..
5f814f2
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-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"
@@
-200,6
+200,8
@@
PAZPAR2_OBJS = \
"$(OBJDIR)\marchash.obj" \
"$(OBJDIR)\normalize_record.obj" \
"$(OBJDIR)\normalize_cache.obj" \
"$(OBJDIR)\marchash.obj" \
"$(OBJDIR)\normalize_record.obj" \
"$(OBJDIR)\normalize_cache.obj" \
+ "$(OBJDIR)\ppmutex.obj" \
+ "$(OBJDIR)\incref.obj" \
"$(OBJDIR)\connection.obj"
"$(OBJDIR)\connection.obj"