summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-04-03 17:04:54 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-04-03 17:04:54 (GMT)
commit4aaeef4ab3e62901320ee961372c34e4527092e7 (patch)
tree4d4642d3aed43f48e638af5f6fcedbb33a4f7aed
parent24fefa78acd936fd521c2a354142716dd494a284 (diff)
downloadtk-4aaeef4ab3e62901320ee961372c34e4527092e7.zip
tk-4aaeef4ab3e62901320ee961372c34e4527092e7.tar.gz
tk-4aaeef4ab3e62901320ee961372c34e4527092e7.tar.bz2
Fixed stubs usage
-rw-r--r--ChangeLog1
-rw-r--r--win/makefile.vc18
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 47892e5..6e687bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2008-04-03 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * win/makefile.vc: Fixed stubs usage
* library/ttk/xpTheme.tcl: fix the colour of labelframe in xp
2008-04-02 Daniel Steffen <das@users.sourceforge.net>
diff --git a/win/makefile.vc b/win/makefile.vc
index c27beff..079ae3b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.119 2008/04/02 14:39:36 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.120 2008/04/03 17:04:55 patthoyts Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -460,11 +460,14 @@ crt = -MT
!endif
BASE_CFLAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
-TK_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
+TK_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES)
CON_CFLAGS = $(cdebug) $(cflags) $(crt) -DCONSOLE
WISH_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES)
STUB_CFLAGS = $(cflags) $(cdebug) $(TK_DEFINES)
+!if !$(STATIC_BUILD)
+TK_CFLAGS = $(TK_CFLAGS) -DUSE_TCL_STUBS
+!endif
#---------------------------------------------------------------------
# Link flags
@@ -499,6 +502,11 @@ dlllflags = $(lflags) -dll
conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows
+tcllibs = $(TCLIMPLIB)
+!if !$(STATIC_BUILD)
+tcllibs = $(TCLSTUBLIB) $(tcllibs)
+!endif
+
baselibs = kernel32.lib user32.lib
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
@@ -626,17 +634,17 @@ $(TKSTUBLIB): $(TKSTUBOBJS)
$(WISH): $(WISHOBJS) $(TKIMPLIB)
- $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(TCLIMPLIB) $**
+ $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
$(_VC_MANIFEST_EMBED_EXE)
$(WISHC): $(WISHOBJS) $(TKIMPLIB)
- $(link32) $(conlflags) -stack:2300000 -out:$@ $(guilibs) $(TCLIMPLIB) $**
+ $(link32) $(conlflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
$(_VC_MANIFEST_EMBED_EXE)
$(TKTEST): $(TKTESTOBJS) $(TKIMPLIB)
- $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(TCLIMPLIB) $**
+ $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
$(_VC_MANIFEST_EMBED_EXE)