diff options
| author | Nikita Nemkin <nikita@nemkin.ru> | 2020-06-23 23:32:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 23:32:23 (GMT) |
| commit | bbf36e8903f8e86dcad8131c818e122537c30f9e (patch) | |
| tree | 5035803018a68426c52c73a21f2a2abea41659f4 /PCbuild | |
| parent | 90ed8a6d71b2d6e0853c14e8e6f85fe730a4329a (diff) | |
| download | cpython-bbf36e8903f8e86dcad8131c818e122537c30f9e.zip cpython-bbf36e8903f8e86dcad8131c818e122537c30f9e.tar.gz cpython-bbf36e8903f8e86dcad8131c818e122537c30f9e.tar.bz2 | |
bpo-41070: Simplify pyshellext.dll build (GH-21037)
Replace MIDL-generated file with manual GUID definition.
Use the same .def file for release and debug builds.
Update setup build to support latest toolset
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyshellext.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/pyshellext.vcxproj.filters | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj index 655054e..ea432d6 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -96,7 +96,7 @@ <Link> <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <SubSystem>Console</SubSystem> - <ModuleDefinitionFile>..\PC\pyshellext$(PyDebugExt).def</ModuleDefinitionFile> + <ModuleDefinitionFile>..\PC\pyshellext.def</ModuleDefinitionFile> </Link> <Midl> <CompileInterface>true</CompileInterface> @@ -104,11 +104,9 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\PC\pyshellext.cpp" /> - <Midl Include="..\PC\pyshellext.idl" /> </ItemGroup> <ItemGroup> <None Include="..\PC\pyshellext.def" /> - <None Include="..\PC\pyshellext_d.def" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\PC\pyshellext.rc" /> diff --git a/PCbuild/pyshellext.vcxproj.filters b/PCbuild/pyshellext.vcxproj.filters index 36d1d16..77cd306 100644 --- a/PCbuild/pyshellext.vcxproj.filters +++ b/PCbuild/pyshellext.vcxproj.filters @@ -16,11 +16,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <Midl Include="..\PC\pyshellext.idl"> - <Filter>Source Files</Filter> - </Midl> - </ItemGroup> - <ItemGroup> <ResourceCompile Include="..\PC\pyshellext.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -29,8 +24,5 @@ <None Include="..\PC\pyshellext.def"> <Filter>Source Files</Filter> </None> - <None Include="..\PC\pyshellext_d.def"> - <Filter>Source Files</Filter> - </None> </ItemGroup> </Project>
\ No newline at end of file |