diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-12-11 06:26:22 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-12-11 06:26:22 (GMT) |
| commit | b65cfdc272905a674cb91cf9eb06d26a338d3b48 (patch) | |
| tree | 5b30f81a5af2bc87f4d91310b782dba598b17d36 /win | |
| parent | 356fd9f8a4147691509aab8965fcab22acc88ddf (diff) | |
| parent | 3c10e2ea6a07b66acc12dedd70921a01dd9429a3 (diff) | |
| download | tk-b65cfdc272905a674cb91cf9eb06d26a338d3b48.zip tk-b65cfdc272905a674cb91cf9eb06d26a338d3b48.tar.gz tk-b65cfdc272905a674cb91cf9eb06d26a338d3b48.tar.bz2 | |
Merge core-8-6-branch fix for static build of wish.
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index a92f452..e72bc30 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -423,9 +423,14 @@ dbgshell: setup $(WISH) windbg $(WISH)
!if $(STATIC_BUILD)
+
$(TKLIB): $(TKOBJS)
$(LIBCMD) @<<
+$**
+<<
+
!else
+
$(TKLIB): $(TKOBJS)
$(DLLCMD) @<<
$**
@@ -434,7 +439,8 @@ $** @if exist $*.exp del $*.exp
$(TKIMPLIB): $(TKLIB)
-!endif
+
+!endif # $(STATIC_BUILD)
$(TKSTUBLIB): $(TKSTUBOBJS)
$(LIBCMD) -nodefaultlib $**
|