diff options
| author | escoffon <escoffon> | 1998-07-29 13:14:12 (GMT) |
|---|---|---|
| committer | escoffon <escoffon> | 1998-07-29 13:14:12 (GMT) |
| commit | a30cd10654919b00fc50ccfb6d31d5a0f9f49b8d (patch) | |
| tree | 3a54be6e804b82e4b1b377ddb823257d96b69d33 | |
| parent | b7b5119a5c2c2f111a10ed98418fe43ec973a5bc (diff) | |
| download | tk-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".
| -rw-r--r-- | generic/tkInt.h | 10 | ||||
| -rw-r--r-- | win/makefile.vc | 24 |
2 files changed, 27 insertions, 7 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 39142a2..f547165 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: %Z% $Id: tkInt.h,v 1.4 1998/07/28 17:28:33 stanton Exp $ + * SCCS: %Z% $Id: tkInt.h,v 1.5 1998/07/29 13:14:12 escoffon Exp $ */ #ifndef _TKINT @@ -27,6 +27,11 @@ #include <tkPort.h> #endif +#ifdef BUILD_tk +# undef EXPORT +# define EXPORT DLLEXPORT +#endif + /* * Opaque type declarations: */ @@ -997,4 +1002,7 @@ EXTERN int TkXFileProc _ANSI_ARGS_((ClientData clientData, EXTERN int TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +#undef EXPORT +#define EXPORT DLLIMPORT + #endif /* _TKINT */ 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) $< |