diff options
| author | davygrvy <davygrvy@pobox.com> | 2002-03-29 22:09:35 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2002-03-29 22:09:35 (GMT) |
| commit | bb29084e616efff4412d8240ff939b7d5278d06c (patch) | |
| tree | 35ad8d10ed77fcfeddaa0e29b6630be74f7b8b79 /win/makefile.vc | |
| parent | cb3ffc68aefa6b11adf7c31ae97da681a91b8c04 (diff) | |
| download | tcl-bb29084e616efff4412d8240ff939b7d5278d06c.zip tcl-bb29084e616efff4412d8240ff939b7d5278d06c.tar.gz tcl-bb29084e616efff4412d8240ff939b7d5278d06c.tar.bz2 | |
A STATIC_BUILD bug fix. -DSTATIC_BUILD wasn't being added to the core's compile rules.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 7bddf6b..34aea15 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.87 2002/03/28 21:45:36 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.88 2002/03/29 22:09:35 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -308,9 +308,6 @@ GENERICDIR = $(ROOT)\generic TOOLSDIR = $(ROOT)\tools WINDIR = $(ROOT)\win -TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -TCL_DEFINES = $(OPTDEFINES) - #--------------------------------------------------------------------- # Compile flags @@ -348,8 +345,14 @@ crt = -MT$(DBGX) !endif BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) -TCL_CFLAGS = $(BASE_CLFAGS) $(TCL_DEFINES) CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE +TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" + +!if $(STATIC_BUILD) +TCL_CFLAGS = $(BASE_CLFAGS) -DSTATIC_BUILD +!else +TCL_CFLAGS = $(BASE_CLFAGS) +!endif #--------------------------------------------------------------------- |