For VS, define _CRT_NONSTDC_NO_DEPRECATE, so we don't warnings about

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index cc45327..7756e0e 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.105 2006-05-03 13:27:20 adam Exp $
+# $Id: makefile,v 1.110 2006-06-07 09:25:47 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -180,7 +180,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:
@@ -190,6 +193,7 @@ $(BINDIR)\libxslt.dll:
 LIBXSLT_LIB=
 LIBXSLT_DEF=/D HAVE_XSLT=0
 libxslt: 
+!endif
 
 
 ### C and CPP compiler  (the same thing)
@@ -202,6 +206,7 @@ COMMON_C_OPTIONS=          \
   $(LIBXML2_DEF)           \
   $(LIBXSLT_DEF)           \
   /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D "_CRT_NONSTDC_NO_DEPRECATE" \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -392,6 +397,9 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\siconv.obj \
    $(OBJDIR)\marc8.obj \
    $(OBJDIR)\marc8r.obj \
+   $(OBJDIR)\record_conv.obj \
+   $(OBJDIR)\retrieval.obj \
+   $(OBJDIR)\libxml2_error.obj \
    $(OBJDIR)\test.obj
 
 YAZ_ZUTIL_OBJS= \
@@ -690,11 +698,11 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
        @cd $(SRCDIR)
-       $(TCL) csvtobib1.tcl
+       $(TCL) csvtobib1.tcl $(SRCDIR)
 
 $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
        @cd $(SRCDIR)
-       $(TCL) csvtosrw.tcl
+       $(TCL) csvtosrw.tcl $(SRCDIR)
 
 !endif