summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authorescoffon <escoffon>1998-07-29 13:14:12 (GMT)
committerescoffon <escoffon>1998-07-29 13:14:12 (GMT)
commita30cd10654919b00fc50ccfb6d31d5a0f9f49b8d (patch)
tree3a54be6e804b82e4b1b377ddb823257d96b69d33 /win/makefile.vc
parentb7b5119a5c2c2f111a10ed98418fe43ec973a5bc (diff)
downloadtk-a30cd10654919b00fc50ccfb6d31d5a0f9f49b8d.zip
tk-a30cd10654919b00fc50ccfb6d31d5a0f9f49b8d.tar.gz
tk-a30cd10654919b00fc50ccfb6d31d5a0f9f49b8d.tar.bz2
Merged changes between child workspace "/home/escoffon/ws/tk8.0" and
parent workspace "/export/home/ws/tk8.0".
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc24
1 files changed, 18 insertions, 6 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index d18adac..565b608 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# SCCS: %Z% $Id: makefile.vc,v 1.7 1998/07/28 17:42:20 welch Exp $
+# SCCS: %Z% $Id: makefile.vc,v 1.8 1998/07/29 13:14:52 escoffon Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -302,7 +302,7 @@ $(TKLIB): $(TKDLL)
$(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\tk.def
set LIB=$(TOOLS32)\lib
- $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
+ $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \
-out:$@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLLIB) \
$(guilibsdll) @<<
$(TKOBJS)
@@ -357,21 +357,33 @@ $(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c
$(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c
$(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@ $?
+$(TMPDIR)\tkConsole.obj: $(ROOT)\generic\tkConsole.c
+ $(cc32) $(TK_CFLAGS) -Fo$@ $?
+
+$(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c
+ $(cc32) $(TK_CFLAGS) -Fo$@ $?
+
+$(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
+ $(cc32) $(TK_CFLAGS) -Fo$@ $?
+
+$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
+ $(cc32) $(TK_CFLAGS) -Fo$@ $?
+
#
# Implicit rules
#
{$(XLIBDIR)}.c{$(TMPDIR)}.obj:
- $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
+ $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
- $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
+ $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
{$(WINDIR)}.c{$(TMPDIR)}.obj:
- $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
+ $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
{$(ROOT)\unix}.c{$(TMPDIR)}.obj:
- $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
+ $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $<
{$(RCDIR)}.rc{$(TMPDIR)}.res:
$(rc32) -fo $@ -r -i $(GENERICDIR) $<