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
Bump version to 2.1.19. Added function yaz_filepath_resolve.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
c033231
..
28c7a5f
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.99 2006-02-01 20:14:31 adam Exp $
+# $Id: makefile,v 1.103 2006-04-19 23:49:50 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
@@
-179,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)\\" \
@@
-373,6
+375,7
@@
YAZ_UTIL_OBJS= \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\marc8.obj \
+ $(OBJDIR)\marc8r.obj \
$(OBJDIR)\test.obj
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\test.obj
YAZ_ZUTIL_OBJS= \
@@
-397,7
+400,8
@@
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\initopt.obj \
- $(OBJDIR)\xmlquery.obj
+ $(OBJDIR)\xmlquery.obj \
+ $(OBJDIR)\mime.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-583,11
+587,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:
@@
-664,6
+668,10
@@
$(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
@cd $(SRCDIR)
$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
@cd $(SRCDIR)
$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
+$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
+ @cd $(SRCDIR)
+ $(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
$(TCL) csvtobib1.tcl
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
$(TCL) csvtobib1.tcl