X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=263e59b3343367e9880216c02e9b51fc2f153c4f;hb=27a9c86e28cd54204d12517a94b338b30805c747;hp=2a6d3ce900a186bcd114d8af9f8de75b6934fbfc;hpb=2e23fabe25973c7614b83ca1151b6c7be7df9024;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 2a6d3ce..263e59b 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,9 @@
 # Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.83 2004-08-18 10:47:48 adam Exp $
+# $Id: makefile,v 1.87 2004-11-21 21:56:28 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
-#
 
 ###########################################################
 ############### Parameters 
@@ -41,13 +40,15 @@ all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
 
 NSIS="c:\program files\nsis\makensis.exe"
 
-nsis: 
+dist: 
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
-	nmake DEBUG=1 dll
 	nmake DEBUG=0
 	$(NSIS) yaz.nsi
 
+nsis:
+	$(NSIS) yaz.nsi
+
 nsishelp:
 	$(NSIS)
 
@@ -86,8 +87,8 @@ TMP=$(TMPDIR)
 ###########################################################
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazdebug.dll
-IMPLIB=$(LIBDIR)\yazdebug.lib
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
 !else
 DLL=$(BINDIR)\yaz.dll
 IMPLIB=$(LIBDIR)\yaz.lib
@@ -171,7 +172,6 @@ COMMON_C_OPTIONS=          \
   $(LIBXML2_DEF)           \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -359,6 +359,7 @@ YAZ_UTIL_OBJS= \
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
+   $(OBJDIR)\diagsrw.obj \
    $(OBJDIR)\zget.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \