summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2001-11-08 21:32:23 (GMT)
committerdavygrvy <davygrvy@pobox.com>2001-11-08 21:32:23 (GMT)
commite4d0496859c869fe7d28e8389dba480191fb8c9a (patch)
tree803d64d2e76b053ac2144ae8bb31d59af8de7b91 /win/rules.vc
parent328e28cf68f156151be173b717a69c7b9eecc994 (diff)
downloadtcl-e4d0496859c869fe7d28e8389dba480191fb8c9a.zip
tcl-e4d0496859c869fe7d28e8389dba480191fb8c9a.tar.gz
tcl-e4d0496859c869fe7d28e8389dba480191fb8c9a.tar.bz2
* win/rules.vc:
* win/makefile.vc: Fixed install target to adjust for the different build types. Added a 'linkexten' option to link the win extensions inside the shell when built static. Placed win/tclAppInit.c patch in SF patch DB for approval. 'profile' option not hooked in yet. Everything else know is done.
Diffstat (limited to 'win/rules.vc')
-rw-r--r--win/rules.vc13
1 files changed, 11 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 81dc1af..43ccae2 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -10,7 +10,7 @@
# Copyright (c) 2001 Tomasoft Engineering.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.2 2001/11/08 00:22:22 davygrvy Exp $
+# RCS: @(#) $Id: rules.vc,v 1.3 2001/11/08 21:32:23 davygrvy Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -39,6 +39,7 @@ TCL_THREADS = 0
DEBUG = 0
PROFILE = 0
MSVCRT = 0
+TCL_LINKWITHEXTENSIONS = 0
!else
!if ![echo $(OPTS) | find /i "static" > nul]
!message *** Doing static
@@ -52,6 +53,12 @@ MSVCRT = 1
!else
MSVCRT = 0
!endif
+!if ![echo $(OPTS) | find /i "linkexten" > nul]
+!message *** Doing linkexten
+TCL_LINKWITHEXTENSIONS = 1
+!else
+TCL_LINKWITHEXTENSIONS = 0
+!endif
!if ![echo $(OPTS) | find /i "threads" > nul]
!message *** Doing threads
TCL_THREADS = 1
@@ -73,9 +80,11 @@ PROFILE = 0
!endif
-# make sure we don't make overly fat DLLs.
!if !$(STATIC_BUILD)
+# Make sure we don't build overly fat DLLs.
MSVCRT = 1
+# Shouldn't statically put the extensions inside the shell when dynamic.
+TCL_LINKWITHEXTENSIONS = 0
!endif