diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-22 10:26:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-22 10:26:32 (GMT) |
| commit | 2b5f153185ed0a402daa10f6e1e86b7aaab41a5b (patch) | |
| tree | 15af853f440fc2b49e802e95f6a1028bcd1a1a02 /win | |
| parent | ac0e511f72ffa121c90ad832a6fcadec631de40e (diff) | |
| download | tk-2b5f153185ed0a402daa10f6e1e86b7aaab41a5b.zip tk-2b5f153185ed0a402daa10f6e1e86b7aaab41a5b.tar.gz tk-2b5f153185ed0a402daa10f6e1e86b7aaab41a5b.tar.bz2 | |
Make sure that the zip-file is attached to tcl9tk90.dll for non-static builds too
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index a5347b1..e56f2a8 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -108,7 +108,7 @@ USING_PRE87_TCL = 1 # Extra makefile options processing for non-standard OPTS values ...
!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
TTK_SQUARE_WIDGET = 0
-TK_EMBED_SCRIPTS = $(STATIC_BUILD)
+TK_EMBED_SCRIPTS = 1
!else
!if [nmakehlp -f "$(OPTS)" "square"]
!message *** Include ttk square demo widget
@@ -121,7 +121,7 @@ TTK_SQUARE_WIDGET = 0 TK_EMBED_SCRIPTS = 0
!else
!message *** Tk script library will be appended to the binary.
-TK_EMBED_SCRIPTS = $(STATIC_BUILD)
+TK_EMBED_SCRIPTS = 1
!endif
!endif
@@ -375,9 +375,6 @@ libtkzip: setup $(TKSCRIPTZIP) embed: setup $(WISH) $(WISHSCRIPTZIP)
@copy /y /b "$(WISH)"+"$(WISHSCRIPTZIP)" "$(WISH)"
!else
-# Note this is currently dead code as TK_EMBED_SCRIPTS is always 0
-# for non-static builds as the C code does not currently setup up
-# a VFS for a non-static wish.
embed: setup $(TKLIB) $(TKSCRIPTZIP)
@copy /y /b "$(TKLIB)"+"$(TKSCRIPTZIP)" "$(TKLIB)"
!endif
|