summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authorescoffon <escoffon>1998-07-21 15:25:42 (GMT)
committerescoffon <escoffon>1998-07-21 15:25:42 (GMT)
commitbdc74a471aa0644cdb55f70d1f751b360f70d543 (patch)
tree4c20defe18daa071eded92cbee3c9498b650563b /win/makefile.vc
parent78fb54b92486e46f62c08bf7c5cffc643630c161 (diff)
downloadtcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.zip
tcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.tar.gz
tcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.tar.bz2
Merged changes between child workspace "/home/escoffon/ws/tcl8.0" and
parent workspace "/export/home/ws/tcl8.0".
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc32
1 files changed, 20 insertions, 12 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 554287f..7c73014 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -58,30 +58,32 @@ NODEBUG = 1
# Do not modify below this line
######################################################################
+NAMEPREFIX = tcl
DOTVERSION = 8.0
VERSION = 80
+BINROOT = .
!IF "$(NODEBUG)" == "1"
-TMPDIR = Release
+TMPDIR = $(BINROOT)\Release
DBGX =
!ELSE
-TMPDIR = Debug
+TMPDIR = $(BINROOT)\Debug
DBGX = d
!ENDIF
OUTDIR = $(TMPDIR)
-TCLLIB = $(OUTDIR)\tcl$(VERSION)$(DBGX).lib
-TCLDLLNAME = tcl$(VERSION)$(DBGX).dll
+TCLLIB = $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib
+TCLDLLNAME = $(NAMEPREFIX)$(VERSION)$(DBGX).dll
TCLDLL = $(OUTDIR)\$(TCLDLLNAME)
-TCLPLUGINLIB = $(OUTDIR)\tcl$(VERSION)p$(DBGX).lib
-TCLPLUGINDLLNAME= tcl$(VERSION)p$(DBGX).dll
+TCLPLUGINLIB = $(OUTDIR)\$(NAMEPREFIX)$(VERSION)p$(DBGX).lib
+TCLPLUGINDLLNAME= $(NAMEPREFIX)$(VERSION)p$(DBGX).dll
TCLPLUGINDLL = $(OUTDIR)\$(TCLPLUGINDLLNAME)
-TCL16DLL = $(OUTDIR)\tcl16$(VERSION)$(DBGX).dll
-TCLSH = $(OUTDIR)\tclsh$(VERSION)$(DBGX).exe
-TCLSHP = $(OUTDIR)\tclshp$(VERSION)$(DBGX).exe
-TCLPIPEDLL = $(OUTDIR)\tclpip$(VERSION)$(DBGX).dll
-TCLREGDLL = $(OUTDIR)\tclreg$(VERSION)$(DBGX).dll
-TCLTEST = $(OUTDIR)\tcltest.exe
+TCL16DLL = $(OUTDIR)\$(NAMEPREFIX)16$(VERSION)$(DBGX).dll
+TCLSH = $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe
+TCLSHP = $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
+TCLPIPEDLL = $(OUTDIR)\$(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
+TCLREGDLL = $(OUTDIR)\$(NAMEPREFIX)reg$(VERSION)$(DBGX).dll
+TCLTEST = $(OUTDIR)\$(NAMEPREFIX)test.exe
DUMPEXTS = $(TMPDIR)\dumpexts.exe
CAT16 = $(TMPDIR)\cat16.exe
CAT32 = $(TMPDIR)\cat32.exe
@@ -257,6 +259,12 @@ cvars = -DWIN32 -D_WIN32
cvarsmt = $(cvars) -D_MT
cvarsdll = $(cvarsmt) -D_DLL
+!IF "$(NODEBUG)" == "1"
+cvarsdll = $(cvars) -MD
+!ELSE
+cvarsdll = $(cvars) -MDd
+!ENDIF
+
######################################################################
# Project specific targets
######################################################################