X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=852812402f34089b4c4d8754a50d7a16ca1f4ca8;hb=27a6d4f7f7425896345ab5a2bfdf35a96c97416e;hp=313a2f650725be9fe8464f86076275cbcda6b6c3;hpb=571cd02bff379234c2eeaf95fdd6b9c038d5b3de;p=idzebra-moved-to-github.git diff --git a/win/makefile b/win/makefile index 313a2f6..8528124 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.61 2006-12-06 13:00:12 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,6 +322,7 @@ TSTFLOCK_OBJS= \ ZEBRALIB_OBJS= \ $(MOD_ALVIS_OBJS) \ + $(MOD_DOM_OBJS) \ $(OBJDIR)\atoi_zn.obj \ $(OBJDIR)\attribute.obj \ $(OBJDIR)\attrfind.obj \