diff options
| author | Segev Finer <segev208@gmail.com> | 2017-06-16 03:12:05 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2017-06-16 03:12:05 (GMT) |
| commit | c9318853bbe8d62cb72ed853b0ffb75311ea474c (patch) | |
| tree | 9a566eea7eb8f7299a88f68ab588b42b92c3ea70 | |
| parent | 51599e2bdd10ab77212a7cbb41a13ea70ee13da8 (diff) | |
| download | cpython-c9318853bbe8d62cb72ed853b0ffb75311ea474c.zip cpython-c9318853bbe8d62cb72ed853b0ffb75311ea474c.tar.gz cpython-c9318853bbe8d62cb72ed853b0ffb75311ea474c.tar.bz2 | |
bpo-30631: Silence MSVC warnings in third-party code (GH-1963)
| -rw-r--r-- | PCbuild/liblzma.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/openssl.props | 1 | ||||
| -rw-r--r-- | PCbuild/pcbuild.sln | 3 | ||||
| -rw-r--r-- | PCbuild/tix.vcxproj | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj index 711f9bd..4ace9d9 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -64,6 +64,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <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> + <DisableSpecificWarnings>4028;4113;4244;4267;4996</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 0de4e43..0fc8adc 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -16,6 +16,7 @@ <PreprocessorDefinitions Include="L_ENDIAN" /> <PreprocessorDefinitions Include="_CRT_SECURE_NO_WARNINGS" /> <PreprocessorDefinitions Include="_CRT_SECURE_NO_DEPRECATE" /> + <PreprocessorDefinitions Include="_WINSOCK_DEPRECATED_NO_WARNINGS" /> <PreprocessorDefinitions Include="OPENSSL_THREADS" /> <!-- <PreprocessorDefinitions Include="OPENSSL_SYSNAME_WIN32" /> --> <PreprocessorDefinitions Include="OPENSSL_IA32_SSE2" /> diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 4da5849..280c486 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -9,6 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" + ProjectSection(ProjectDependencies) = postProject + {0E9791DB-593A-465F-98BC-681011311618} = {0E9791DB-593A-465F-98BC-681011311618} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" EndProject diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj index d1bc0ab..7d6d8ca 100644 --- a/PCbuild/tix.vcxproj +++ b/PCbuild/tix.vcxproj @@ -59,6 +59,7 @@ <TixDirs>BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"</TixDirs> <DebugFlags Condition="'$(Configuration)' == 'Debug'">DEBUG=1 NODEBUG=0 TCL_DBGX=g TK_DBGX=g</DebugFlags> <DebugFlags Condition="'$(Configuration)' != 'Debug'">DEBUG=0 NODEBUG=1</DebugFlags> + <CFlags>-c -W3 -nologo -MD -wd4028 -wd4090</CFlags> <NMakeBuildCommandLine>setlocal @(ExpectedOutputs->'if not exist "%(FullPath)" goto build',' ') @@ -66,7 +67,7 @@ goto :eof :build set VCINSTALLDIR=$(VCInstallDir) cd /D "$(tixDir)win" -nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install +nmake /nologo -f makefile.vc MACHINE=$(TclMachine) cflags="$(CFlags)" $(DebugFlags) $(TclShortVersions) $(TixDirs) all install </NMakeBuildCommandLine> <NMakeCleanCommandLine>rmdir /q/s "$(OutDir.TrimEnd(`\`))"</NMakeCleanCommandLine> </PropertyGroup> |