Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
On Windows Tcl/Tk 9.0.3 is built without embedded Tcl/Tk library scripts.
6 changes: 3 additions & 3 deletions PCbuild/tcl.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

<PropertyGroup>
<TclOpts>msvcrt</TclOpts>
<TclOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TclOpts>
<TclOpts>noembed,msvcrt</TclOpts>
<TclOpts Condition="$(Configuration) == 'Debug'">symbols,noembed,msvcrt</TclOpts>
<TclDirs>BUILDDIRTOP="$(BuildDirTop)" INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TclDirs>
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
<WarningsFlags>WARNINGS="-W3 -wd4311 -wd4312"</WarningsFlags>
<NMakeBuildCommandLine>setlocal
set VCINSTALLDIR=$(VCInstallDir)
cd /D "$(tclDir)win"
nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) $(WarningsFlags) $(TclshNativeFlag) core shell dlls
nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) $(WarningsFlags) $(TclshNativeFlag) core shell dlls libtclzip
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the extra target create any more DLLs that we need to include in the distribution?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new target does not require any new DLLs.

This just explicitly requests for libtcl9.0.3.zip to be created. It is needed in the install step as the file is copied into the lib directory regardless of the embed/noembed option. When using the default embed option this file is created automatically and then embedded at the end of the DLL.

It seem odd that this file is included in the install-libraries target as it is not required at runtime from what I can tell. It is either embedded in the DLL (embed) or included unpacked (noembed). I'm going to check with upstream for a answer.

nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) $(WarningsFlags) $(TclshNativeFlag) install-binaries install-libraries
copy /Y ..\license.terms "$(OutDir)\tcllicense.terms"
</NMakeBuildCommandLine>
Expand Down
4 changes: 2 additions & 2 deletions PCbuild/tk.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

<PropertyGroup>
<TkOpts>msvcrt</TkOpts>
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,msvcrt</TkOpts>
<TkOpts>noembed,msvcrt</TkOpts>
<TkOpts Condition="$(Configuration) == 'Debug'">symbols,noembed,msvcrt</TkOpts>
<TkDirs>BUILDDIRTOP="$(BuildDirTop)" TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs>
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags>
<WarningsFlags>WARNINGS="-W3 -wd4244 -wd4267 -wd4311 -wd4312 -wd4334"</WarningsFlags>
Expand Down
Loading