Skip to content

Commit

Permalink
Make sure that the zip-file is attached to tcl9tk90.dll for non-stati…
Browse files Browse the repository at this point in the history
…c builds too
  • Loading branch information
jan.nijtmans committed Dec 22, 2023
1 parent ac0e511 commit 2b5f153
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions win/makefile.vc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2b5f153

Please sign in to comment.