projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix term counters to be of type zint. Fix several printfs of zint.
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
9d204c5
..
94dbb20
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.20 2002-11-26 22:20:06 adam Exp $
+# $Id: makefile,v 1.27 2004-08-06 12:27:30 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-9,11
+9,11
@@
DEBUG=0 # 0 for release, 1 for debug
# EXPAT is optional. It's required for grs.xml-filters.
HAVE_EXPAT=1
# EXPAT is optional. It's required for grs.xml-filters.
HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.4
+EXPAT_DIR= c:\Expat-1.95.7
# iconv is optional
# iconv is optional
-HAVE_ICONV=0
-ICONV_DIR = c:\libiconv-1.7.0.1
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.9.1.win32
default: all
default: all
@@
-27,7
+27,7
@@
all: dirs zebralib zserver zindex
ROOTDIR=.. # The home of zebra
# YAZ include files, libraries, etc.
ROOTDIR=.. # The home of zebra
# YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22
YAZINCL=$(YAZDIR)\include
YAZLIB=$(YAZDIR)\lib\yaz.lib
YAZLIBS=$(YAZLIB)
YAZINCL=$(YAZDIR)\include
YAZLIB=$(YAZDIR)\lib\yaz.lib
YAZLIBS=$(YAZLIB)
@@
-214,11
+214,9
@@
APITEST_OBJS= \
ZEBRALIB_OBJS= \
$(OBJDIR)\isam.obj \
$(OBJDIR)\isamc.obj \
ZEBRALIB_OBJS= \
$(OBJDIR)\isam.obj \
$(OBJDIR)\isamc.obj \
- $(OBJDIR)\isamd.obj \
$(OBJDIR)\isutil.obj \
$(OBJDIR)\memory.obj \
$(OBJDIR)\merge.obj \
$(OBJDIR)\isutil.obj \
$(OBJDIR)\memory.obj \
$(OBJDIR)\merge.obj \
- $(OBJDIR)\merge-d.obj \
$(OBJDIR)\physical.obj \
$(OBJDIR)\rootblk.obj \
$(OBJDIR)\zebra-lock.obj \
$(OBJDIR)\physical.obj \
$(OBJDIR)\rootblk.obj \
$(OBJDIR)\zebra-lock.obj \
@@
-227,6
+225,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
$(OBJDIR)\charmap.obj \
+ $(OBJDIR)\atoi_zn.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
$(OBJDIR)\compact.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
$(OBJDIR)\compact.obj \
@@
-246,10
+245,14
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\lookup.obj \
$(OBJDIR)\lookupec.obj \
$(OBJDIR)\marcread.obj \
$(OBJDIR)\lookup.obj \
$(OBJDIR)\lookupec.obj \
$(OBJDIR)\marcread.obj \
+ $(OBJDIR)\marcomp.obj \
+ $(OBJDIR)\inline.obj \
$(OBJDIR)\mfile.obj \
$(OBJDIR)\open.obj \
$(OBJDIR)\passwddb.obj \
$(OBJDIR)\mfile.obj \
$(OBJDIR)\open.obj \
$(OBJDIR)\passwddb.obj \
+ $(OBJDIR)\zvrank.obj \
$(OBJDIR)\rank1.obj \
$(OBJDIR)\rank1.obj \
+ $(OBJDIR)\livcode.obj \
$(OBJDIR)\readfile.obj \
$(OBJDIR)\recctrl.obj \
$(OBJDIR)\recgrs.obj \
$(OBJDIR)\readfile.obj \
$(OBJDIR)\recctrl.obj \
$(OBJDIR)\recgrs.obj \
@@
-258,6
+261,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\rectext.obj \
$(OBJDIR)\regxread.obj \
$(OBJDIR)\xmlread.obj \
$(OBJDIR)\rectext.obj \
$(OBJDIR)\regxread.obj \
$(OBJDIR)\xmlread.obj \
+ $(OBJDIR)\danbibr.obj \
$(OBJDIR)\res.obj \
$(OBJDIR)\retrieve.obj \
$(OBJDIR)\rsbool.obj \
$(OBJDIR)\res.obj \
$(OBJDIR)\retrieve.obj \
$(OBJDIR)\rsbool.obj \
@@
-284,6
+288,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\rsisamd.obj \
$(OBJDIR)\rsisamb.obj \
$(OBJDIR)\rsbetween.obj \
$(OBJDIR)\rsisamd.obj \
$(OBJDIR)\rsisamb.obj \
$(OBJDIR)\rsbetween.obj \
+ $(OBJDIR)\rsprox.obj \
$(OBJDIR)\dir.obj \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\extract.obj \
$(OBJDIR)\dir.obj \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\extract.obj \
@@
-307,7
+312,8
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\d1_sutrs.obj \
$(OBJDIR)\d1_tagset.obj \
$(OBJDIR)\d1_varset.obj \
$(OBJDIR)\d1_sutrs.obj \
$(OBJDIR)\d1_tagset.obj \
$(OBJDIR)\d1_varset.obj \
- $(OBJDIR)\d1_write.obj
+ $(OBJDIR)\d1_write.obj \
+ $(OBJDIR)\xpath.obj
ALL_OBJS=\
$(ZEBRALIB_OBJS) \
ALL_OBJS=\
$(ZEBRALIB_OBJS) \