From 4ef25db4552cb9a06ebd4d0e3ab39cb39ab6ea7a Mon Sep 17 00:00:00 2001
From: escoffon <escoffon>
Date: Thu, 18 Jun 1998 19:56:31 +0000
Subject: Added changes to support builds of different configurations in
 parallel: - the NODEBUG flag controls Debug/Release builds - different values
 of NODEBUG create temp files in either Debug or Release subdirectories. -
 Debug DLLs and executables follow the Windows convention of a 'd' at the end
 of the name (e.g. tcl80d.dll)

---
 win/makefile.vc | 51 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index ab0be82..8bd7890 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -33,7 +33,6 @@
 #
 
 ROOT		= ..
-TMPDIR		= .
 TOOLS32		= c:\progra~1\devstudio\vc
 TOOLS32_rc	= c:\progra~1\devstudio\sharedide
 TOOLS16		= c:\msvc
@@ -41,8 +40,8 @@ TOOLS16		= c:\msvc
 # Set this to the appropriate value of /MACHINE: for your platform
 MACHINE	= IX86
 
-# Comment the following line to compile with symbols
-NODEBUG=1
+# Set NODEBUG to 0 to compile with symbols
+NODEBUG = 1
 
 # uncomment one of the following lines to compile with TCL_MEM_DEBUG, 
 # TCL_MEM_DEBUG, or TCL_COMPILE_DEBUG
@@ -57,17 +56,25 @@ NODEBUG=1
 
 VERSION = 80
 
-TCLLIB		= tcl$(VERSION).lib
-TCLDLL		= tcl$(VERSION).dll
-TCLPLUGINLIB	= tcl$(VERSION)p.lib
-TCLPLUGINDLL	= tcl$(VERSION)p.dll
-TCL16DLL	= tcl16$(VERSION).dll
-TCLSH		= tclsh$(VERSION).exe
-TCLSHP		= tclshp$(VERSION).exe
+!IF "$(NODEBUG)" == "1"
+TMPDIR		= .\Release
+DBGX		=
+!ELSE
+TMPDIR		= .\Debug
+DBGX		= d
+!ENDIF
+
+TCLLIB		= tcl$(VERSION)$(DBGX).lib
+TCLDLL		= tcl$(VERSION)$(DBGX).dll
+TCLPLUGINLIB	= tcl$(VERSION)p$(DBGX).lib
+TCLPLUGINDLL	= tcl$(VERSION)p$(DBGX).dll
+TCL16DLL	= tcl16$(VERSION)$(DBGX).dll
+TCLSH		= tclsh$(VERSION)$(DBGX).exe
+TCLSHP		= tclshp$(VERSION)$(DBGX).exe
+TCLPIPEDLL	= tclpip$(VERSION)$(DBGX).dll
+TCLREGDLL	= tclreg$(VERSION)$(DBGX).dll
 TCLTEST		= tcltest.exe
 DUMPEXTS	= $(TMPDIR)\dumpexts.exe
-TCLPIPEDLL	= tclpip$(VERSION).dll
-TCLREGDLL	= tclreg$(VERSION).dll
 CAT16		= cat16.exe
 CAT32		= cat32.exe
 
@@ -166,7 +173,7 @@ DLL16_CFLAGS	= $(cdebug) $(cflags) $(include16) -ALw
 # Link flags
 ######################################################################
 
-!IFDEF NODEBUG
+!IF "$(NODEBUG)" == "1"
 ldebug = /RELEASE
 !ELSE
 ldebug = -debug:full -debugtype:cv
@@ -207,7 +214,7 @@ conlibsdll = $(libcdll) $(baselibs)
 # Compile flags
 ######################################################################
 
-!IFDEF NODEBUG
+!IF "$(NODEBUG)" == "1"
 cdebug = -Oti -Gs -GD
 !ELSE
 cdebug = -Z7 -Od -WX
@@ -240,17 +247,20 @@ cvarsdll   = $(cvarsmt) -D_DLL
 # Project specific targets
 ######################################################################
 
-release:    $(TCLSH) dlls
-dlls:	    $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL)
-all:	    $(TCLSH) dlls $(CAT16) $(CAT32) 
-tcltest:    $(TCLTEST) dlls $(CAT16) $(CAT32)
-plugin:	    $(TCLPLUGINDLL) $(TCLSHP)
-test:	    $(TCLTEST) dlls $(CAT16) $(CAT32) 
+release:    setup $(TCLSH) dlls
+dlls:	    setup $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL)
+all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32) 
+tcltest:    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
+plugin:	    setup $(TCLPLUGINDLL) $(TCLSHP)
+test:	    setup $(TCLTEST) dlls $(CAT16) $(CAT32) 
 	$(TCLTEST) <<
 		cd ../tests
 		source all
 <<
 
+setup:
+	md $(TMPDIR)
+
 $(DUMPEXTS): $(WINDIR)\winDumpExts.c
 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
 	set LIB=$(TOOLS32)\lib
@@ -378,3 +388,4 @@ clean:
         -@del $(TMPDIR)\*.obj
         -@del $(TMPDIR)\*.res
         -@del $(TMPDIR)\*.def
+        -@del $(TMPDIR)\*.exe
-- 
cgit v0.12