8000 bpo-30631: Silence MSVC warnings in third-party code (GH-1963) · python/cpython@c931885 · GitHub
[go: up one dir, main page]
Skip to content

Commit c931885

Browse files
segevfinerzware
segevfiner
authored and
zware
committed
bpo-30631: Silence MSVC warnings in third-party code (GH-1963)
1 parent 51599e2 commit c931885

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

‎PCbuild/liblzma.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
6565
<Optimization>Disabled</Optimization>
6666
<AdditionalIncludeDirectories>$(lzmaDir)windows;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple</AdditionalIncludeDirectories>
67+
<DisableSpecificWarnings>4028;4113;4244;4267;4996</DisableSpecificWarnings>
6768
</ClCompile>
6869
</ItemDefinitionGroup>
6970
<ItemGroup>

‎PCbuild/openssl.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PreprocessorDefinitions Include="L_ENDIAN" />
1717
<PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" />
1818
<PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" />
19+
<PreprocessorDefinitions Include="_WINSOCK_DEPRECATED_NO_WARNINGS" />
1920
<PreprocessorDefinitions Include="OPENSSL_THREADS" />
2021
<!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> -->
2122
<PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" />

‎PCbuild/pcbuild.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
EndProjectSection
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
12+
ProjectSection(ProjectDependencies) = postProject
13+
{0E9791DB-593A-465F-98BC-681011311618} = {0E9791DB-593A-465F-98BC-681011311618}
14+
EndProjectSection
1215
EndProject
1316
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
1417
EndProject

‎PCbuild/tix.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@
5959
<TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs>
6060
<DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g</DebugFlags>
6161
<DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</DebugFlags>
62+
<CFlags>-c -W3 -nologo -MD -wd4028 -wd4090</CFlags>
6263
<NMakeBuildCommandLine>setlocal
6364
@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
6465
')
6566
goto :eof
6667
:build
6768
set VCINSTALLDIR=$(VCInstallDir)
6869
cd /D "$(tixDir)win"
69-
nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install
70+
nmake /nologo -f makefile.vc MACHINE=$(TclMachine) cflags="$(CFlags)" $(DebugFlags) $(TclShortVersions) $(TixDirs) all install
7071
</NMakeBuildCommandLine>
7172
<NMakeCleanCommandLine>rmdir /q/s "$(OutDir.TrimEnd(`\`))"</NMakeCleanCommandLine>
7273
</PropertyGroup>

0 commit comments

Comments
 (0)
0