diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-07-17 09:15:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 09:15:48 (GMT) |
| commit | 68d663cf85d1ac5eaf83482eed39c0a6f8093601 (patch) | |
| tree | fe26ff995655c31aca2d5c0f7bc4f8048cca5cc4 /PCbuild/tk.vcxproj | |
| parent | 49f6449ef4b81537c19b82329caaf60596c516c2 (diff) | |
| download | cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.zip cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.gz cpython-68d663cf85d1ac5eaf83482eed39c0a6f8093601.tar.bz2 | |
[bpo-30916] Pre-build OpenSSL and Tcl/Tk for Windows (#2688)
Updates ssl and tkinter projects to use pre-built externals
Diffstat (limited to 'PCbuild/tk.vcxproj')
| -rw-r--r-- | PCbuild/tk.vcxproj | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj index a26318b..f90e482 100644 --- a/PCbuild/tk.vcxproj +++ b/PCbuild/tk.vcxproj @@ -49,14 +49,6 @@ <TargetPath>$(OutDir)bin\$(tkDLLName)</TargetPath> </PropertyGroup> - <ItemGroup> - <ExpectedOutputs Include=" - $(OutDir)bin\$(tkDLLName); - $(OutDir)include\tk.h; - $(OutDir)lib\$(tkLibName); - $(OutDir)lib\tk$(TkMajorVersion).$(TkMinorVersion)" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <PropertyGroup> @@ -65,14 +57,11 @@ <TkDirs>TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"</TkDirs> <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"</DebugFlags> <NMakeBuildCommandLine>setlocal -@(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' -') -goto :eof -:build set VCINSTALLDIR=$(VCInstallDir) cd /D "$(tkDir)win" nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) all nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) install-binaries install-libraries +copy /Y ..\license.terms "$(OutDir)\tklicense.terms" </NMakeBuildCommandLine> </PropertyGroup> <ItemGroup> @@ -83,15 +72,7 @@ nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Target Name="CopyDll" Inputs="$(OutDir)\bin\$(tkDLLName)" Outputs="$(BuildPath)$(tkDLLName)" AfterTargets="Build"> - <Copy SourceFiles="$(OutDir)\bin\$(tkDLLName)" DestinationFiles="$(BuildPath)$(tkDLLName)" /> - </Target> - <Target Name="Clean" /> - <Target Name="CleanAll"> - <Delete Files="$(TargetPath);$(BuildPath)$(tkDLLName)" /> - <RemoveDir Directories="$(IntDir)" /> - </Target> <Target Name="ResolveAssemblyReferences" /> </Project>
\ No newline at end of file |