summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authorkennykb <kennykb@noemail.net>2003-03-23 02:25:21 (GMT)
committerkennykb <kennykb@noemail.net>2003-03-23 02:25:21 (GMT)
commite936264d23f4caab75b51674af2d8e8bfa276b79 (patch)
treef15bf6945627163484dc895e9d7ba89feee38439 /win/makefile.vc
parentc14e5f3cc9c79258ffaf3e3c24a6d9f8128a977f (diff)
downloadtk-e936264d23f4caab75b51674af2d8e8bfa276b79.zip
tk-e936264d23f4caab75b51674af2d8e8bfa276b79.tar.gz
tk-e936264d23f4caab75b51674af2d8e8bfa276b79.tar.bz2
Corrected several problems that prevented OPTS=symbols from building
properly. [Patch 707792] Thanks to Joe Mistachkin for the fixes. FossilOrigin-Name: 10a8982de82ffd20e9bd30ddff572a7bae7f2098
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc18
1 files changed, 13 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 7470ade..2762c4d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.67.2.2 2003/03/13 16:41:48 kennykb Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.67.2.3 2003/03/23 02:25:21 kennykb Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -373,9 +373,17 @@ cflags = $(cflags) -QIA64_Bx
!endif
!if $(MSVCRT)
-crt = -MD$(DBGX)
+!if "$(DBGX)" == ""
+crt = -MD
!else
-crt = -MT$(DBGX)
+crt = -MDd
+!endif
+!else
+!if "$(DBGX)" == ""
+crt = -MT
+!else
+crt = -MTd
+!endif
!endif
BASE_CLFAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
@@ -450,9 +458,9 @@ test: setup $(TKTEST) $(TKLIB) $(CAT32)
set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
!if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE"
- $(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
+ $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
!else
- $(TKTEST) $(ROOT)/tests/all.tcl $(TESTFLAGS) | $(CAT32)
+ $(TKTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
!endif
runtest: setup $(TKTEST) $(TKLIB) $(CAT32)