projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo "libtools" (is now "libtool")
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
b967dc9
..
4cac3a4
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1994-2005, Index Data ApS
# All rights reserved.
# Copyright (C) 1994-2005, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.96 2005-09-09 11:28:48 adam Exp $
+# $Id: makefile,v 1.102 2006-03-15 13:32:06 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-44,6
+44,7
@@
HHC="c:\program files\html help workshop\hhc.exe"
dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
+ nmake DEBUG=1
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=0
$(NSIS) yaz.nsi
@@
-111,6
+112,7
@@
ZOOMTST5=$(BINDIR)\zoomtst5.exe
ZOOMTST6=$(BINDIR)\zoomtst6.exe
ZOOMTST7=$(BINDIR)\zoomtst7.exe
ZOOMTST8=$(BINDIR)\zoomtst8.exe
ZOOMTST6=$(BINDIR)\zoomtst6.exe
ZOOMTST7=$(BINDIR)\zoomtst7.exe
ZOOMTST8=$(BINDIR)\zoomtst8.exe
+ZOOMTST9=$(BINDIR)\zoomtst9.exe
CQL2PQF=$(BINDIR)\cql2pqf.exe
CQL2XCQL=$(BINDIR)\cql2xcql.exe
CQL2PQF=$(BINDIR)\cql2pqf.exe
CQL2XCQL=$(BINDIR)\cql2xcql.exe
@@
-124,7
+126,7
@@
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
ztest: dirs generate $(ZTEST)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
@@
-178,9
+180,10
@@
libxml2:
# (if you set things up right!)
COMMON_C_OPTIONS= \
# (if you set things up right!)
COMMON_C_OPTIONS= \
- /nologo /W3 /GX /FD /c \
+ /nologo /W3 /EHsc /FD /c \
$(ICONV_DEF) \
$(LIBXML2_DEF) \
$(ICONV_DEF) \
$(LIBXML2_DEF) \
+ /D "_CRT_SECURE_NO_DEPRECATE" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
@@
-288,6
+291,8
@@
YAZ_ZOOMTST7_OBJS = \
$(OBJDIR)\zoomtst7.obj
YAZ_ZOOMTST8_OBJS = \
$(OBJDIR)\zoomtst8.obj
$(OBJDIR)\zoomtst7.obj
YAZ_ZOOMTST8_OBJS = \
$(OBJDIR)\zoomtst8.obj
+YAZ_ZOOMTST9_OBJS = \
+ $(OBJDIR)\zoomtst9.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
YAZ_CQL2PQF_OBJS = \
$(OBJDIR)\cql2pqf.obj
@@
-369,7
+374,8
@@
YAZ_UTIL_OBJS= \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
- $(OBJDIR)\marc8.obj
+ $(OBJDIR)\marc8.obj \
+ $(OBJDIR)\test.obj
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
@@
-377,6
+383,7
@@
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\diag-entry.obj \
$(OBJDIR)\zget.obj \
$(OBJDIR)\logrpn.obj \
+ $(OBJDIR)\querytowrbuf.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
@@
-391,7
+398,9
@@
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-opt.obj \
- $(OBJDIR)\initopt.obj
+ $(OBJDIR)\initopt.obj \
+ $(OBJDIR)\xmlquery.obj \
+ $(OBJDIR)\mime.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-577,11
+586,11
@@
generated_files: \
# yaz client
{$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
# yaz client
{$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $< /D"_CONSOLE"
+ $(CPP) $(COPT) $< /D"_CONSOLE"
# Ztest
{$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
# Ztest
{$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $< /D"_CONSOLE"
+ $(CPP) $(COPT) $< /D"_CONSOLE"
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
@@
-834,6
+843,19
@@
$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
/out:$(ZOOMTST8)
<<
/out:$(ZOOMTST8)
<<
+
+$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS)
+ @echo Linking $(ZOOMTST9)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(CLIENT_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST9_OBJS)
+ /map:"$(LIBDIR)\zoomtst9.map"
+ /out:$(ZOOMTST9)
+<<
+
$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS)
@echo Linking $(CQL2PQF)
$(LINK) @<<
$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS)
@echo Linking $(CQL2PQF)
$(LINK) @<<