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
Fixed bad memory reference that could occur if empty key block was to
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
7618577
..
8528124
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.58 2006-10-05 13:19:10 adam Exp $
+# $Id: makefile,v 1.63 2007-03-07 21:25:29 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-159,7
+159,7
@@
iconv:
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
@@
-193,9
+193,15
@@
libxslt:
!if $(HAVE_LIBXSLT)
MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
!if $(HAVE_LIBXSLT)
MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
+
+MOD_DOM_OBJS= $(OBJDIR)\mod_dom.obj
+MOD_DOM_CFLAGS=/DIDZEBRA_STATIC_DOM=1
!else
MOD_ALVIS_OBJS=
MOD_ALVIS_CFLAGS=
!else
MOD_ALVIS_OBJS=
MOD_ALVIS_CFLAGS=
+
+MOD_DOM_OBJS=
+MOD_DOM_CFLAGS=
!endif
### C and CPP compiler (the same thing)
!endif
### C and CPP compiler (the same thing)
@@
-225,6
+231,7
@@
COMMON_C_OPTIONS= \
/DIDZEBRA_STATIC_GRS_MARC=1 \
/DIDZEBRA_STATIC_GRS_DANBIB=1 \
$(MOD_ALVIS_CFLAGS) \
/DIDZEBRA_STATIC_GRS_MARC=1 \
/DIDZEBRA_STATIC_GRS_DANBIB=1 \
$(MOD_ALVIS_CFLAGS) \
+ $(MOD_DOM_CFLAGS) \
/DIDZEBRA_STATIC_SAFARI=1 \
$(BZIP2DEF)
/DIDZEBRA_STATIC_SAFARI=1 \
$(BZIP2DEF)
@@
-315,12
+322,14
@@
TSTFLOCK_OBJS= \
ZEBRALIB_OBJS= \
$(MOD_ALVIS_OBJS) \
ZEBRALIB_OBJS= \
$(MOD_ALVIS_OBJS) \
+ $(MOD_DOM_OBJS) \
$(OBJDIR)\atoi_zn.obj \
$(OBJDIR)\attribute.obj \
$(OBJDIR)\attrfind.obj \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
$(OBJDIR)\atoi_zn.obj \
$(OBJDIR)\attribute.obj \
$(OBJDIR)\attrfind.obj \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
+ $(OBJDIR)\check_res.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
@@
-353,6
+362,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\dopen.obj \
$(OBJDIR)\drdwr.obj \
$(OBJDIR)\dirs.obj \
$(OBJDIR)\dopen.obj \
$(OBJDIR)\drdwr.obj \
+ $(OBJDIR)\exit.obj \
$(OBJDIR)\extract.obj \
$(OBJDIR)\flock.obj \
$(OBJDIR)\imalloc.obj \
$(OBJDIR)\extract.obj \
$(OBJDIR)\flock.obj \
$(OBJDIR)\imalloc.obj \
@@
-362,8
+372,10
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\isamb.obj \
$(OBJDIR)\isamc.obj \
$(OBJDIR)\isams.obj \
$(OBJDIR)\isamb.obj \
$(OBJDIR)\isamc.obj \
$(OBJDIR)\isams.obj \
- $(OBJDIR)\kcompare.obj \
+ $(OBJDIR)\isam_methods.obj \
+ $(OBJDIR)\it_key.obj \
$(OBJDIR)\kcontrol.obj \
$(OBJDIR)\kcontrol.obj \
+ $(OBJDIR)\key_block.obj \
$(OBJDIR)\kinput.obj \
$(OBJDIR)\limit.obj \
$(OBJDIR)\lookgrep.obj \
$(OBJDIR)\kinput.obj \
$(OBJDIR)\limit.obj \
$(OBJDIR)\lookgrep.obj \
@@
-408,6
+420,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\sortidx.obj \
$(OBJDIR)\states.obj \
$(OBJDIR)\stream.obj \
$(OBJDIR)\sortidx.obj \
$(OBJDIR)\states.obj \
$(OBJDIR)\stream.obj \
+ $(OBJDIR)\su_codec.obj \
$(OBJDIR)\symtab.obj \
$(OBJDIR)\trunc.obj \
$(OBJDIR)\untrans.obj \
$(OBJDIR)\symtab.obj \
$(OBJDIR)\trunc.obj \
$(OBJDIR)\untrans.obj \