WIN32 updates for marc8.c

diff --git a/win/makefile b/win/makefile
index bb1f3ac..28509e4 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.51 2002-12-05 12:16:39 adam Exp $
+# $Id: makefile,v 1.52 2002-12-16 14:06:34 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -136,6 +136,7 @@ COMMON_C_OPTIONS=          \
   $(ICONV_DEF)             \
   /D "_WINDOWS"            \
   /D "WIN32"               \
+  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -312,8 +313,8 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\wrbuf.obj \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
-   $(OBJDIR)\siconv.obj
-
+   $(OBJDIR)\siconv.obj \
+   $(OBJDIR)\marc8.obj
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
@@ -600,6 +601,10 @@ $(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
        $(TCL) $(TCLOPT) -d ill.tcl item-req.asn
        @cd $(WINDIR)
 
+$(UTILDIR)\marc8.c: $(UTILDIR)\charconv.sgm
+       @cd $(UTILDIR)
+       $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
+
 !endif
 
 
@@ -845,7 +850,10 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.51  2002-12-05 12:16:39  adam
+# Revision 1.52  2002-12-16 14:06:34  adam
+# WIN32 updates for marc8.c
+#
+# Revision 1.51  2002/12/05 12:16:39  adam
 # yaz_strerror. WIN32 updates for mterm2.asn
 #
 # Revision 1.50  2002/10/24 12:14:01  heikki

diff --git a/win/yaz.nsi b/win/yaz.nsi
index a505a53..7f4138a 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,4 +1,4 @@
-; $Id: yaz.nsi,v 1.15 2002-11-26 13:42:35 adam Exp $
+; $Id: yaz.nsi,v 1.16 2002-12-16 14:06:34 adam Exp $
 
 !define VERSION "1.9.2"
 
@@ -95,15 +95,19 @@ Section "YAZ Source"
        SetOutPath $INSTDIR\util
        File ..\util\*.c
        File ..\util\*.tcl
+       File ..\util\*.sgm
+       File ..\util\yaz-comp
        SetOutPath $INSTDIR\odr
        File ..\odr\*.c
        File ..\odr\*.h
        SetOutPath $INSTDIR\z39.50
        File ..\z39.50\*.c
        File ..\z39.50\*.asn
+       File ..\z39.50\*.tcl
        SetOutPath $INSTDIR\ill
        File ..\ill\*.c
        File ..\ill\*.asn
+       File ..\ill\*.tcl
        SetOutPath $INSTDIR\zutil
        File ..\zutil\*.c
        File ..\zutil\*.h