X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=852812402f34089b4c4d8754a50d7a16ca1f4ca8;hb=14ad407ad29aa99585b84f7606508a7bec752019;hp=aa117c6a8de6b47648d47c6725a5018fc143ad36;hpb=9a3756e232c5891f08e9bf36a41c44e9bbf3ef5a;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index aa117c6..8528124 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.60 2006-11-24 19:48:23 adam Exp $
+# $Id: makefile,v 1.63 2007-03-07 21:25:29 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -159,7 +159,7 @@ iconv:
 
 !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:
@@ -193,9 +193,15 @@ libxslt:
 !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=
+
+MOD_DOM_OBJS=
+MOD_DOM_CFLAGS=
 !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) \
+  $(MOD_DOM_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -315,12 +322,14 @@ TSTFLOCK_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)\check_res.obj \
 	$(OBJDIR)\charmap.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \