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/openssl.props | |
| 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/openssl.props')
| -rw-r--r-- | PCbuild/openssl.props | 87 |
1 files changed, 17 insertions, 70 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 0fc8adc..9ebe8a6 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -1,77 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Py_IntDir Condition="'$(Py_IntDir)' == ''">$(opensslDir)tmp\</Py_IntDir> - </PropertyGroup> - - <Import Project="pyproject.props" /> - - <PropertyGroup Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - </PropertyGroup> - - <ItemGroup> - <PreprocessorDefinitions Include="DSO_WIN32" /> - <PreprocessorDefinitions Include="WIN32_LEAN_AND_MEAN" /> - <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" /> - <PreprocessorDefinitions Include="OPENSSL_BN_ASM_GF2m" /> - <PreprocessorDefinitions Include="SHA1_ASM" /> - <PreprocessorDefinitions Include="SHA256_ASM" /> - <PreprocessorDefinitions Include="SHA512_ASM" /> - <PreprocessorDefinitions Include="MD5_ASM" /> - <PreprocessorDefinitions Include="AES_ASM" /> - <PreprocessorDefinitions Include="VPAES_ASM" /> - <PreprocessorDefinitions Include="WHIRLPOOL_ASM" /> - <PreprocessorDefinitions Include="GHASH_ASM" /> - <PreprocessorDefinitions Include="OPENSSL_NO_IDEA" /> - <PreprocessorDefinitions Include="OPENSSL_NO_RC5" /> - <PreprocessorDefinitions Include="OPENSSL_NO_MD2" /> - <PreprocessorDefinitions Include="OPENSSL_NO_MDC2" /> - <PreprocessorDefinitions Include="OPENSSL_NO_KRB5" /> - <PreprocessorDefinitions Include="OPENSSL_NO_JPAKE" /> - <PreprocessorDefinitions Include="OPENSSL_NO_RDRAND" /> - <PreprocessorDefinitions Include="OPENSSL_NO_RSAX" /> - <PreprocessorDefinitions Include="OPENSSL_NO_DYNAMIC_ENGINE" /> - </ItemGroup> - <ItemGroup Condition="'$(Platform)'=='Win32'"> - <PreprocessorDefinitions Include="OPENSSL_BN_ASM_PART_WORDS" /> - <PreprocessorDefinitions Include="OPENSSL_BN_ASM_MONT" /> - <PreprocessorDefinitions Include="RMD160_ASM" /> - </ItemGroup> - - <PropertyGroup> - <_PreprocessorDefinitionList>@(PreprocessorDefinitions)</_PreprocessorDefinitionList> - </PropertyGroup> - <ItemDefinitionGroup> <ClCompile> - <!-- Suppress 64-bit truncation warnings - they aren't ours to worry about --> - <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(opensslDir);$(opensslIncludeDir);$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes</AdditionalIncludeDirectories> - <PreprocessorDefinitions>$(_PreprocessorDefinitionList);%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> + <Link> + <AdditionalLibraryDirectories>$(opensslOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> </ItemDefinitionGroup> - - <Target Name="FindNasm"> - <PropertyGroup> - <nasm Condition="$(Platform) == 'Win32'">nasm.exe -f win32</nasm> - <nasm Condition="$(Platform) == 'x64'">nasm.exe -f win64 -DNEAR -Ox -g</nasm> - </PropertyGroup> + <ItemGroup> + <_SSLDLL Include="$(opensslOutDir)\libeay32.dll" /> + <_SSLDLL Include="$(opensslOutDir)\libeay32.pdb" /> + <_SSLDLL Include="$(opensslOutDir)\ssleay32.dll" /> + <_SSLDLL Include="$(opensslOutDir)\ssleay32.pdb" /> + </ItemGroup> + <Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build"> + <Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" /> </Target> - - <Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')"> - <Exec Command='setlocal -set PATH=$(nasmDir);%PATH% -$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' /> - <ItemGroup> - <Link Include="$(IntDir)%(NasmCompile.Filename).obj" /> - <Lib Include="$(IntDir)%(NasmCompile.Filename).obj" /> - </ItemGroup> + <Target Name="_CleanSSLDLL" BeforeTargets="Clean"> + <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" /> </Target> -</Project> +</Project>
\ No newline at end of file |