X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=2eb19f4796e40c68bf325db1b6eee1a4db9e3798;hb=ac5f8ad9508f5b3ada38117b0da7ae23c650ab1e;hp=488c958cda3ea9552063ec2bce79ea451c731ab5;hpb=91e4c648cb5ba156f197059870050252d497bc4d;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 488c958..2eb19f4 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.43 2002-07-25 13:45:30 adam Exp $
+# $Id: makefile,v 1.46 2002-08-30 11:28:01 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -26,11 +26,11 @@
 DEBUG=1   # 0 for release, 1 for debug
 
 # iconv
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\program files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 default: all
@@ -124,7 +124,7 @@ ICONV_DEF= \
   /D HAVE_ICONV_H=0
 ICONV_LIB=
 !endif
-  
+
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -171,7 +171,8 @@ LINK=link.exe
 
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib $(ICONV_LIB)
+           wsock32.lib  advapi32.lib \
+           $(ICONV_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -308,7 +309,9 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\tpath.obj \
    $(OBJDIR)\wrbuf.obj \
    $(OBJDIR)\xmalloc.obj \
-   $(OBJDIR)\matchstr.obj 
+   $(OBJDIR)\matchstr.obj \
+   $(OBJDIR)\siconv.obj
+
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
@@ -848,7 +851,16 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.43  2002-07-25 13:45:30  adam
+# Revision 1.46  2002-08-30 11:28:01  adam
+# Remove EXPAT reader
+#
+# Revision 1.45  2002/08/27 22:33:30  adam
+# siconv added
+#
+# Revision 1.44  2002/07/25 14:19:18  adam
+# EXPAT support on WIN32
+#
+# Revision 1.43  2002/07/25 13:45:30  adam
 # iconv.dll
 #
 # Revision 1.42  2002/06/05 21:11:00  adam