From ae9e4081d57d307c56ac7581dcb3b66f9bb0c4d4 Mon Sep 17 00:00:00 2001
From: davygrvy <davygrvy@pobox.com>
Date: Tue, 13 Nov 2001 04:30:51 +0000
Subject: 	* win/buildall.vc.bat(new): 	* win/makefile.vc:  Small fix
 with deriving the "OriginalFilename" 	string in the .rc scripts.  Added a
 quick batchfile for building 	the entire thing.

---
 win/buildall.vc.bat | 12 ++++++++++++
 win/makefile.vc     | 23 ++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100755 win/buildall.vc.bat

diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
new file mode 100755
index 0000000..d3ecc66
--- /dev/null
+++ b/win/buildall.vc.bat
@@ -0,0 +1,12 @@
+@echo off
+
+if "%MSVCDir%" == "" call c:\dev\devstudio60\vc98\bin\vcvars32.bat
+set INSTALLDIR=d:\tclTestArea
+
+nmake -nologo -f makefile.vc %1 release winhelp OPTS=none
+nmake -nologo -f makefile.vc %1 release OPTS=static
+nmake -nologo -f makefile.vc %1 core dlls OPTS=static,msvcrt
+nmake -nologo -f makefile.vc %1 core OPTS=static,threads
+nmake -nologo -f makefile.vc %1 dlls OPTS=static,msvcrt,threads
+nmake -nologo -f makefile.vc %1 shell OPTS=threads
+pause
diff --git a/win/makefile.vc b/win/makefile.vc
index 21b01fa..709314e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001 Tomasoft Engineering.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.72 2001/11/10 10:38:47 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.73 2001/11/13 04:30:51 davygrvy Exp $
 #------------------------------------------------------------------------------
 
 !if "$(MSVCDIR)" == ""
@@ -421,9 +421,13 @@ $(TCLIMPLIB): $(TCLLIB)
 
 $(TCLLIB): $(TCLOBJS)
 !if $(STATIC_BUILD)
-	$(lib32) -nologo -out:$@ $**
+	$(lib32) -nologo -out:$@ @<<
+$**
+<<
 !else
-	$(link32) $(ldebug) $(dlllflags) -out:$@ $(winlibs) $**
+	$(link32) $(ldebug) $(dlllflags) -out:$@ $(winlibs) @<<
+$**
+<<
 	-@del $*.exp
 !endif
 
@@ -692,8 +696,17 @@ $<
 <<
 
 {$(WINDIR)}.rc{$(TMP_DIR)}.res:
-	$(rc32) -fo $@ -r -i $(GENERICDIR) $(include32) -D__WIN32__ \
-		$(TCL_DEFINES) -d DEBUG=$(DEBUG) $<
+	$(rc32) -fo $@ -r -i $(GENERICDIR) -D__WIN32__ \
+!if $(DEBUG)
+	-d DEBUG \
+!endif
+!if $(TCL_THREADS)
+	-d TCL_THREADS \
+!endif
+!if $(STATIC_BUILD)
+	-d STATIC_BUILD \
+!endif
+	$<
 
 
 #---------------------------------------------------------------------
-- 
cgit v0.12