diff options
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/bdist_wininst.vcxproj | 103 | ||||
-rw-r--r-- | PCbuild/bdist_wininst.vcxproj.filters | 61 | ||||
-rw-r--r-- | PCbuild/pcbuild.proj | 2 | ||||
-rw-r--r-- | PCbuild/pcbuild.sln | 4 |
4 files changed, 1 insertions, 169 deletions
diff --git a/PCbuild/bdist_wininst.vcxproj b/PCbuild/bdist_wininst.vcxproj deleted file mode 100644 index f7f9cd8..0000000 --- a/PCbuild/bdist_wininst.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGInstrument|Win32"> - <Configuration>PGInstrument</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGInstrument|x64"> - <Configuration>PGInstrument</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGUpdate|Win32"> - <Configuration>PGUpdate</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="PGUpdate|x64"> - <Configuration>PGUpdate</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}</ProjectGuid> - <RootNamespace>wininst</RootNamespace> - <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget> - <SupportPGO>false</SupportPGO> - </PropertyGroup> - <Import Project="python.props" /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseOfMfc>false</UseOfMfc> - <CharacterSet>NotSet</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="pyproject.props" /> - </ImportGroup> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir>$(PySourcePath)lib\distutils\command\</OutDir> - <LinkIncremental>false</LinkIncremental> - <TargetName>wininst-$(VisualStudioVersion)</TargetName> - <TargetName Condition="$(Platform) == 'x64'">$(TargetName)-amd64</TargetName> - <TargetExt>.exe</TargetExt> - </PropertyGroup> - <ItemDefinitionGroup> - <Midl> - <TypeLibraryName>$(OutDir)wininst.tlb</TypeLibraryName> - </Midl> - <ClCompile> - <Optimization>MinSpace</Optimization> - <AdditionalIncludeDirectories>$(PySourcePath)PC\bdist_wininst;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <ResourceCompile> - <AdditionalIncludeDirectories>$(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ResourceCompile> - <Link> - <AdditionalDependencies>comctl32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\PC\bdist_wininst\extract.c" /> - <ClCompile Include="..\PC\bdist_wininst\install.c" /> - <ClCompile Include="..\Modules\zlib\adler32.c" /> - <ClCompile Include="..\Modules\zlib\crc32.c" /> - <ClCompile Include="..\Modules\zlib\inffast.c" /> - <ClCompile Include="..\Modules\zlib\inflate.c" /> - <ClCompile Include="..\Modules\zlib\inftrees.c" /> - <ClCompile Include="..\Modules\zlib\zutil.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\PC\bdist_wininst\archive.h" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\PC\bdist_wininst\install.rc" /> - </ItemGroup> - <ItemGroup> - <None Include="..\PC\bdist_wininst\PythonPowered.bmp" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/PCbuild/bdist_wininst.vcxproj.filters b/PCbuild/bdist_wininst.vcxproj.filters deleted file mode 100644 index b4b6a4d..0000000 --- a/PCbuild/bdist_wininst.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{293b1092-03ad-4b7c-acb9-c4ab62e52f55}</UniqueIdentifier> - <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> - </Filter> - <Filter Include="Source Files\zlib"> - <UniqueIdentifier>{0edc0406-282f-4dbc-b60e-a867c34a2a31}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{ea0c0f0e-3b73-474e-a999-e9689d032ccc}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{0c77c1cf-3f87-4f87-bd86-b425211c2181}</UniqueIdentifier> - <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\PC\bdist_wininst\extract.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\PC\bdist_wininst\install.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\adler32.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\crc32.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\inffast.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\inflate.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\inftrees.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - <ClCompile Include="..\Modules\zlib\zutil.c"> - <Filter>Source Files\zlib</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\PC\bdist_wininst\archive.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="..\PC\bdist_wininst\install.rc"> - <Filter>Resource Files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\PC\bdist_wininst\PythonPowered.bmp"> - <Filter>Resource Files</Filter> - </None> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index 332a029..404b8d4 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -37,8 +37,6 @@ <Projects Include="python3dll.vcxproj" /> <!-- py[w].exe --> <Projects Include="pylauncher.vcxproj;pywlauncher.vcxproj" /> - <!-- wininst-1x.0.exe --> - <Projects Include="bdist_wininst.vcxproj" /> <!-- _freeze_importlib --> <Projects Include="_freeze_importlib.vcxproj" /> <!-- Extension modules --> diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index e24defd..7b37635 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -48,7 +48,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata. EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
EndProject
@@ -421,9 +421,7 @@ Global {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|x64
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.Build.0 = Release|Win32
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|x64
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.Build.0 = Release|x64
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.ActiveCfg = Debug|Win32
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.Build.0 = Debug|Win32
{447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.ActiveCfg = Debug|x64
|