diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-08 10:44:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-08 10:44:11 (GMT) |
| commit | 7696b5f9e55594492063aa904e77de0e4060926c (patch) | |
| tree | 6b62902bd91048bbbf405725a49ae47df741d638 | |
| parent | 19b8ee093c95c70bf0d8382bedf22aea3a1325aa (diff) | |
| download | tk-7696b5f9e55594492063aa904e77de0e4060926c.zip tk-7696b5f9e55594492063aa904e77de0e4060926c.tar.gz tk-7696b5f9e55594492063aa904e77de0e4060926c.tar.bz2 | |
Static builds on Windows should include the "dde" and "registry" extensions too.
| -rw-r--r-- | win/winMain.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/win/winMain.c b/win/winMain.c index f8c3e78..bc66575 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -34,7 +34,15 @@ extern Tcl_PackageInitProc Tktest_Init; #endif #endif /* TK_TEST */ -#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES +#if !defined(TCL_USE_STATIC_PACKAGES) +# if TCL_MAJOR_VERSION > 8 || TCL_MINOR_VERSION > 6 +# define TCL_USE_STATIC_PACKAGES 1 +# else +# define TCL_USE_STATIC_PACKAGES 0 +# endif +#endif + +#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES extern Tcl_PackageInitProc Registry_Init; extern Tcl_PackageInitProc Dde_Init; extern Tcl_PackageInitProc Dde_SafeInit; @@ -209,7 +217,7 @@ Tcl_AppInit( return TCL_ERROR; } } -#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES +#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES if (Registry_Init(interp) == TCL_ERROR) { return TCL_ERROR; } |