From 707b62b5378bac707f83b60aed5aff0b73ab04ca Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 26 Apr 2004 09:31:00 +0000
Subject: [PATCH] Update for 1.4.2

---
 win/irtcl.rc |   36 +++++++++++++++---------------------
 win/makefile |   34 +++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/win/irtcl.rc b/win/irtcl.rc
index f18f235..7df57bd 100644
--- a/win/irtcl.rc
+++ b/win/irtcl.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -47,15 +47,14 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,1,1
- PRODUCTVERSION 1,4,1,1
+ FILEVERSION 1,4,2,1
+ PRODUCTVERSION 1,4,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,18 +69,15 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "Information Retrieval Toolkit for Tcl\0"
-            VALUE "CompanyName", "Index Data\0"
-            VALUE "FileDescription", "IrTcl\0"
-            VALUE "FileVersion", "1, 4, 1, 1\0"
-            VALUE "InternalName", "IrTcl\0"
-            VALUE "LegalCopyright", "Copyright © 1995-2003 Index Data\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "irtcl.rc\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "IrTcl\0"
-            VALUE "ProductVersion", "1, 4, 1, 1\0"
-            VALUE "SpecialBuild", "\0"
+            VALUE "Comments", "Information Retrieval Toolkit for Tcl"
+            VALUE "CompanyName", "Index Data"
+            VALUE "FileDescription", "IrTcl"
+            VALUE "FileVersion", "1, 4, 2, 1"
+            VALUE "InternalName", "IrTcl"
+            VALUE "LegalCopyright", "Copyright © 1995-2004 Index Data"
+            VALUE "OriginalFilename", "irtcl.rc"
+            VALUE "ProductName", "IrTcl"
+            VALUE "ProductVersion", "1, 4, 2, 1"
         END
     END
     BLOCK "VarFileInfo"
@@ -90,8 +86,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/win/makefile b/win/makefile
index da3ff68..7ef0d9c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,8 +1,8 @@
 # IRTCL makefile for MS NMAKE 
-# $Id: makefile,v 1.4 2003-03-05 22:06:32 adam Exp $
+# $Id: makefile,v 1.5 2004-04-26 09:31:00 adam Exp $
 #
 # Log at the end of the file
-VERSION=1.4.1
+VERSION=1.4.2
  
 ###########################################################
 ############### Parameters 
@@ -22,8 +22,9 @@ all: dirs irtcl
 ROOTDIR=..   # The home of IRTCL
 
 # TCL include files, libraries, etc.
-TCLINCL="c:\program files\tcl\include"
-TCLLIB="c:\program files\tcl\lib\tclstub83.lib"
+TCLDIR=c:\tcl
+TCLINCL=$(TCLDIR)\include
+TCLLIB=$(TCLDIR)\lib\tclstub84.lib
 
 # YAZ include files, libraries, etc.
 YAZDIR=$(ROOTDIR)\..\YAZ
@@ -62,7 +63,8 @@ irtcl : $(IRTCLDLL)
 # (if you set things up right!)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo \
+  /W3 /GX /FD /c   \
   /D "WIN32" \
   /D "IR_TCL_VERSION=\"$(VERSION)\""  \
   /D USE_TCL_STUBS=1       \
@@ -71,9 +73,9 @@ COMMON_C_OPTIONS=          \
   /Fd"$(OBJDIR)\\"
 
 COMMON_C_INCLUDES= \
-  /I$(SRCDIR) \
-  /I$(YAZINCL) \
-  /I$(TCLINCL) \
+  /I"$(SRCDIR)" \
+  /I"$(YAZINCL)" \
+  /I"$(TCLINCL)" \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
@@ -109,7 +111,6 @@ LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            wsock32.lib  advapi32.lib
 
 COMMON_LNK_OPTIONS= \
-	/nologo \
 	/machine:i386 \
 	/incremental:no
 
@@ -160,10 +161,10 @@ ALL_OBJS=$(IRTCL_OBJS)
 # source files. Funny way of doing it, but it works.
 
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 ###########################################################
 ############### Resources
@@ -197,9 +198,9 @@ $(IRTCLDLL) : "$(BINDIR)" $(IRTCL_OBJS) $(RES)
 		/nologo
 		$(IRTCL_OBJS) 
 		$(RES)
-		/out:$(IRTCLDLL) 
-		$(YAZLIB)
-		$(TCLLIB)
+		/out:"$(IRTCLDLL)"
+		"$(YAZLIB)"
+		"$(TCLLIB)"
 <<
 
 
@@ -238,7 +239,10 @@ $(ALL_OBJS): makefile
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.4  2003-03-05 22:06:32  adam
+# Revision 1.5  2004-04-26 09:31:00  adam
+# Update for 1.4.2
+#
+# Revision 1.4  2003/03/05 22:06:32  adam
 # TclStubs on WIN32
 #
 # Revision 1.3  2003/01/30 13:27:07  adam
-- 
1.7.10.4