X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=cae6a842024f54eac201b7833f2912778c67e8bb;hb=3ee7ef4088b265faffbdcabe3eb13d5f04a3b832;hp=e921c9474f4896a0f62622756e084a3307c2deca;hpb=713e1de05a39d3bab7f9becc34d7ebf244c26651;p=yaz-moved-to-github.git diff --git a/win/makefile b/win/makefile index e921c94..cae6a84 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,6 @@ # Copyright (C) 1994-2006, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.108 2006-05-24 09:40:26 adam Exp $ +# $Id: makefile,v 1.111 2006-06-07 14:25:43 adam Exp $ # # Programmed by # Heikki Levanto & Adam Dickmeiss @@ -48,7 +48,6 @@ HHC="c:\program files\html help workshop\hhc.exe" dist: nmake DEBUG=1 clean nmake DEBUG=0 clean - nmake DEBUG=1 nmake DEBUG=0 $(NSIS) yaz.nsi @@ -180,7 +179,10 @@ libxml2: !if $(HAVE_LIBXSLT) LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib" -LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include" +LIBXSLT_DEF= \ + /D HAVE_XSLTSAVERESULTTOSTRING=1 \ + /D HAVE_XSLT=1 \ + /I"$(LIBXSLT_DIR)\include" libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\libxslt.dll: @@ -203,6 +205,7 @@ COMMON_C_OPTIONS= \ $(LIBXML2_DEF) \ $(LIBXSLT_DEF) \ /D "_CRT_SECURE_NO_DEPRECATE" \ + /D "_CRT_NONSTDC_NO_DEPRECATE" \ /D "_WINDOWS" \ /D "WIN32" \ /FR"$(OBJDIR)\\" \