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
Added framework for the pos calls. rsisamb and rsnull have a real one,
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
4c9e651
..
f60ba1f
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.19 2002-11-26 22:04:13 adam Exp $
+# $Id: makefile,v 1.25 2003-11-29 16:47:58 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.8.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.4
YAZINCL=$(YAZDIR)\include
YAZLIB=$(YAZDIR)\lib\yaz.lib
YAZLIBS=$(YAZLIB)
YAZINCL=$(YAZDIR)\include
YAZLIB=$(YAZDIR)\lib\yaz.lib
YAZLIBS=$(YAZLIB)
@@
-35,8
+35,6
@@
YAZBINDIR=$(YAZDIR)\bin
YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
-DEFAULT_PROFILE_PATH=0
-
# BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
# (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
# BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
# (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
@@
-127,6
+125,7
@@
COMMON_C_OPTIONS= \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\" \
+ /DDEFAULT_PROFILE_PATH=0 \
$(BZIP2DEF)
COMMON_C_INCLUDES= \
$(BZIP2DEF)
COMMON_C_INCLUDES= \
@@
-247,10
+246,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 \
@@
-308,7
+311,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) \