X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e55a55e0b8682c509c5bdc768614ded43f4b6eab;hb=069747eea98eaa9df53282368a481ac26fd2e0e6;hp=b2ea8df05b03885e93d543ef1e7cf33711e49e41;hpb=5b72794c95eb694bd6717e5c11b0a4e45078a56b;p=idzebra-moved-to-github.git diff --git a/win/makefile b/win/makefile index b2ea8df..e55a55e 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # Zebra makefile for MS NMAKE -# $Id: makefile,v 1.62 2006-12-15 21:11:37 adam Exp $ +# $Id: makefile,v 1.64 2007-05-08 14:55:30 adam Exp $ ########################################################### ############### Parameters @@ -45,13 +45,13 @@ YAZINCL=$(YAZDIR)\include YAZLIBS=$(YAZLIB) YAZBINDIR=$(YAZDIR)\bin !if $(DEBUG) -YAZLIB="$(YAZDIR)\lib\yazd.lib" -YAZ_DLL_SOURCE="$(YAZBINDIR)\yazd.dll" -YAZ_DLL_TARGET="$(BINDIR)\yazd.dll" +YAZLIB="$(YAZDIR)\lib\yaz3d.lib" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll" !else -YAZLIB="$(YAZDIR)\lib\yaz.lib" -YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz.dll" -YAZ_DLL_TARGET="$(BINDIR)\yaz.dll" +YAZLIB="$(YAZDIR)\lib\yaz3.lib" +YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll" +YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll" !endif # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2. @@ -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 \