Skip to content

C
cpython
Commit 34462388 authored by Kristján Valur Jónsson's avatar Kristján Valur Jónsson
Browse files
Options

Merging changes 55092, 55101,55120 from trunk, making PCBuild8 solution up to date.

parent eef5cad1
Hide whitespace changes
Inline Side-by-side
Showing with 464 additions and 18 deletions
PCbuild8/_ctypes/_ctypes.vcproj
View file @ 34462388
......@@ -16,12 +16,15 @@
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath=".\masm64.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\pyd_d.vsprops"
InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
>
<Tool
......@@ -30,6 +33,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -42,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -93,9 +99,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="..\pyd_d.vsprops"
InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
>
<Tool
......@@ -104,6 +109,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -117,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -169,7 +177,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops"
InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -179,6 +187,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -190,7 +201,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -243,7 +254,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops"
InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -253,6 +264,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -265,7 +279,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -318,7 +332,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -328,6 +342,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -339,7 +356,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -392,7 +409,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -402,6 +419,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -414,7 +434,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -467,7 +487,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -477,6 +497,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -488,7 +511,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -541,7 +564,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -551,6 +574,9 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
......@@ -563,7 +589,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -721,6 +747,74 @@
<File
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"
>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="PGInstrument|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="PGUpdate|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM64"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM64"
/>
</FileConfiguration>
<FileConfiguration
Name="PGInstrument|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM64"
/>
</FileConfiguration>
<FileConfiguration
Name="PGUpdate|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="MASM64"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
......
PCbuild8/_ctypes/_ctypes.vsprops 0 → 100644
View file @ 34462388
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="_ctypes"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
/>
</VisualStudioPropertySheet>
PCbuild8/_ctypes/masm64.rules 0 → 100644
View file @ 34462388
<?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile
Name="Microsoft Macro Assembler 64 bit"
Version="8.00"
>
<Rules>
<CustomBuildRule
Name="MASM64"
DisplayName="Microsoft Macro Assembler 64 bit"
CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"
Outputs="[$ObjectFileName]"
FileExtensions="*.asm"
ExecutionDescription="Assembling (x64) ..."
>
<Properties>
<BooleanProperty
Name="NoLogo"
DisplayName="Suppress Startup Banner"
Description="Suppress the display of the startup banner and information messages. (/nologo)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/nologo"
DefaultValue="true"
/>
<StringProperty
Name="ObjectFileName"
DisplayName="Object File Name"
PropertyPageName="Object File"
Description="Specifies the name of the output object file. (/Fo:[file])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Fo&quot;[value]&quot;"
DefaultValue="$(IntDir)\$(InputName).obj"
/>
<EnumProperty
Name="PreserveIdentifierCase"
DisplayName="Preserve Identifier Case"
Description="Specifies preservation of case of user identifiers. (/Cp, /Cx)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
DefaultValue="0"
>
<Values>
<EnumValue
Value="0"
DisplayName="Default"
/>
<EnumValue
Value="1"
Switch="/Cp"
DisplayName="Preserves Identifier Case (/Cp)"
/>
<EnumValue
Value="3"
Switch="/Cx"
DisplayName="Preserves case in public and extern symbols. (/Cx)"
/>
</Values>
</EnumProperty>
<StringProperty
Name="PreprocessorDefinitions"
DisplayName="Preprocessor Definitions"
Description="Defines a text macro with the given name. (/D[symbol])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/D&quot;[value]&quot;"
Delimited="true"
Inheritable="true"
/>
<BooleanProperty
Name="GeneratePreprocessedSourceListing"
DisplayName="Generate Preprocessed Source Listing"
PropertyPageName="Listing File"
Description="Generates a preprocessed source listing to the Output Window. (/EP)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/EP"
/>
<StringProperty
Name="AssembledCodeListingFile"
DisplayName="Assembled Code Listing File"
PropertyPageName="Listing File"
Description="Generates an assembled code listing file. (/Fl[file])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Fl&quot;[value]&quot;"
/>
<StringProperty
Name="SourceListingLineWidth"
DisplayName="Source Listing Line Width"
PropertyPageName="Listing File"
Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width. (/Sl [width])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sl [value]"
/>
<StringProperty
Name="SourceListingPageLength"
DisplayName="Source Listing Page Length"
PropertyPageName="Listing File"
Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length. (/Sp [length])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sp [value]"
/>
<StringProperty
Name="IncludePaths"
DisplayName="Include Paths"
Description="Sets path for include file. A maximum of 10 /I options is allowed. (/I [path])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/I &quot;[value]&quot;"
Delimited="true"
Inheritable="true"
/>
<BooleanProperty
Name="ListAllAvailableInformation"
DisplayName="List All Available Information"
PropertyPageName="Listing File"
Description="Turns on listing of all available information. (/Sa)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sa"
/>
<BooleanProperty
Name="AddFirstPassListing"
DisplayName="Add First Pass Listing"
PropertyPageName="Listing File"
Description="Adds first-pass listing to listing file. (/Sf)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sf"
/>
<BooleanProperty
Name="EnableAssemblyGeneratedCodeListing"
DisplayName="Enable Assembly Generated Code Listing"
PropertyPageName="Listing File"
Description="Turns on listing of assembly-generated code. (/Sg)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sg"
/>
<BooleanProperty
Name="DisableSymbolTable"
DisplayName="Disable Symbol Table"
PropertyPageName="Listing File"
Description="Turns off symbol table when producing a listing. (/Sn)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sn"
/>
<StringProperty
Name="SourceListingSubTitle"
DisplayName="Source Listing Subtitle"
PropertyPageName="Listing File"
Description="Specifies subtitle text for source listing. Same as SUBTITLE text. (/Ss [subtitle])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Ss [value]"
/>
<StringProperty
Name="SourceListingTitle"
DisplayName="Source Listing Title"
PropertyPageName="Listing File"
Description="Specifies title for source listing. Same as TITLE text. (/St [title])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/St [value]"
/>
<BooleanProperty
Name="EnableFalseConditionalsInListing"
DisplayName="Enable False Conditionals In Listing"
PropertyPageName="Listing File"
Description="Turns on false conditionals in listing. (/Sx)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Sx"
/>
<EnumProperty
Name="WarningLevel"
DisplayName="Warning Level"
Description="Sets the warning level, where level = 0, 1, 2, or 3. (/W0, /W1, /W2, /W3)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
DefaultValue="3"
>
<Values>
<EnumValue
Value="0"
Switch="/W0"
DisplayName="Warning Level 0 (/W0)"
/>
<EnumValue
Value="1"
Switch="/W1"
DisplayName="Warning Level 1 (/W1)"
/>
<EnumValue
Value="2"
Switch="/W2"
DisplayName="Warning Level 2 (/W2)"
/>
<EnumValue
Value="3"
Switch="/W3"
DisplayName="Warning Level 3 (/W3)"
/>
</Values>
</EnumProperty>
<BooleanProperty
Name="TreatWarningsAsErrors"
DisplayName="Treat Warnings As Errors"
Description="Returns an error code if warnings are generated. (/WX)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/WX"
/>
<BooleanProperty
Name="MakeAllSymbolsPublic"
DisplayName="Make All Symbols Public"
PropertyPageName="Object File"
Description="Makes all symbols public. (/Zf)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Zf"
/>
<BooleanProperty
Name="GenerateDebugInformation"
DisplayName="Generate Debug Information"
Description="Generates Debug Information. (/Zi)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Zi"
DefaultValue="true"
/>
<EnumProperty
Name="PackAlignmentBoundary"
DisplayName="Pack Alignment Boundary"
PropertyPageName="Advanced"
Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16. (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
>
<Values>
<EnumValue
Value="0"
DisplayName="Default"
/>
<EnumValue
Value="1"
Switch="/Zp1"
DisplayName="One Byte Boundary (/Zp1)"
/>
<EnumValue
Value="2"
Switch="/Zp2"
DisplayName="Two Byte Boundary (/Zp2)"
/>
<EnumValue
Value="3"
Switch="/Zp4"
DisplayName="Four Byte Boundary (/Zp4)"
/>
<EnumValue
Value="4"
Switch="/Zp8"
DisplayName="Eight Byte Boundary (/Zp8)"
/>
<EnumValue
Value="5"
Switch="/Zp16"
DisplayName="Sixteen Byte Boundary (/Zp16)"
/>
</Values>
</EnumProperty>
<BooleanProperty
Name="PerformSyntaxCheckOnly"
DisplayName="Perform Syntax Check Only"
Description="Performs a syntax check only. (/Zs)"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/Zs"
/>
<EnumProperty
Name="ErrorReporting"
DisplayName="Error Reporting"
PropertyPageName="Advanced"
Description="Reports internal assembler errors to Microsoft. (/errorReport:[method])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
>
<Values>
<EnumValue
Value="0"
Switch="/errorReport:prompt"
DisplayName="Prompt to send report immediately (/errorReport:prompt)"
/>
<EnumValue
Value="1"
Switch="/errorReport:queue"
DisplayName="Prompt to send report at the next logon (/errorReport:queue)"
/>
<EnumValue
Value="2"
Switch="/errorReport:send"
DisplayName="Automatically send report (/errorReport:send)"
/>
<EnumValue
Value="3"
Switch="/errorReport:none"
DisplayName="Do not send report (/errorReport:none)"
/>
</Values>
</EnumProperty>
<StringProperty
Name="BrowseFile"
DisplayName="Generate Browse Information File"
PropertyPageName="Advanced"
Description="Specifies whether to generate browse information file and its optional name or location of the browse information file. (/FR[name])"
HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
Switch="/FR&quot;[value]&quot;"
Delimited="true"
Inheritable="true"
/>
</Properties>
</CustomBuildRule>
</Rules>
</VisualStudioToolFile>
PCbuild8/make_versioninfo/make_versioninfo.vcproj
View file @ 34462388
......@@ -90,7 +90,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Generating python_rc.h"
CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc_d.h&#x0D;&#x0A;"
CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......
PCbuild8/pyproject.vsprops
View file @ 34462388
......@@ -15,6 +15,10 @@
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(OutDir)"
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\PC;..\..\Include"
/>
<UserMacro
Name="PyDllName"
Value="python25"
......
PCbuild8/python/python.vcproj
View file @ 34462388
......@@ -65,6 +65,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1"
/>
<Tool
......@@ -140,6 +142,7 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="3000000"
TargetMachine="17"
/>
<Tool
......@@ -212,6 +215,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -287,6 +292,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......@@ -361,6 +367,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -436,6 +444,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......@@ -510,6 +519,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -585,6 +596,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......
PCbuild8/pythoncore/pythoncore.vcproj
View file @ 34462388
......@@ -937,6 +937,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath="..\..\PC\python_nt.rc"
>
</File>
</Filter>
<Filter
Name="Include"
......
PCbuild8/pythonw/pythonw.vcproj
View file @ 34462388
......@@ -65,6 +65,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1"
/>
<Tool
......@@ -140,6 +142,7 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="3000000"
TargetMachine="17"
/>
<Tool
......@@ -211,6 +214,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -285,6 +290,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......@@ -358,6 +364,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -432,6 +440,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......@@ -505,6 +514,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
......@@ -579,6 +590,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7