diff options
| author | davygrvy <davygrvy> | 2002-11-04 07:49:43 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2002-11-04 07:49:43 (GMT) |
| commit | 5efb972739e1035f9a910dc0206079818b052ba1 (patch) | |
| tree | 7368d859ec4ea15e18816d9d443cd06c71986936 /win/winMain.c | |
| parent | 38730b27a6b3d9798ef4658a13408c22fbd8271b (diff) | |
| download | tk-5efb972739e1035f9a910dc0206079818b052ba1.zip tk-5efb972739e1035f9a910dc0206079818b052ba1.tar.gz tk-5efb972739e1035f9a910dc0206079818b052ba1.tar.bz2 | |
* win/winMain.c (Tcl_AppInit): Calls Registry_Init() and
Dde_Init() when STATIC_BUILD and TCL_USE_STATIC_PACKAGES macros
are set.
* win/makefile.vc: linkexten option now sets the
TCL_USE_STATIC_PACKAGES macro which also adds the registry and
dde static lib files to the link of the shell. [Patch 479697]
* win/rules.vc: Matches the one from Tcl.
* win/buildall.vc.bat: More useful commentary.
Diffstat (limited to 'win/winMain.c')
| -rw-r--r-- | win/winMain.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/win/winMain.c b/win/winMain.c index c0b3e2f..edfd42f 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: winMain.c,v 1.14 2002/10/19 02:10:07 hobbs Exp $ + * RCS: @(#) $Id: winMain.c,v 1.15 2002/11/04 07:49:43 davygrvy Exp $ */ #include <tk.h> @@ -173,6 +173,22 @@ Tcl_AppInit(interp) goto error; } } +#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) + { + extern Tcl_PackageInitProc Registry_Init; + extern Tcl_PackageInitProc Dde_Init; + + if (Registry_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticPackage(interp, "registry", Registry_Init, NULL); + + if (Dde_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticPackage(interp, "dde", Dde_Init, NULL); + } +#endif #ifdef TK_TEST if (Tktest_Init(interp) == TCL_ERROR) { |