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

parent eef5cad1
...@@ -16,12 +16,15 @@ ...@@ -16,12 +16,15 @@
/> />
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
<ToolFile
RelativePath=".\masm64.rules"
/>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd_d.vsprops" InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
...@@ -30,6 +33,9 @@ ...@@ -30,6 +33,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -42,7 +48,7 @@ ...@@ -42,7 +48,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -93,9 +99,8 @@ ...@@ -93,9 +99,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd_d.vsprops" InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
...@@ -104,6 +109,9 @@ ...@@ -104,6 +109,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -117,7 +125,7 @@ ...@@ -117,7 +125,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -169,7 +177,7 @@ ...@@ -169,7 +177,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops" InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -179,6 +187,9 @@ ...@@ -179,6 +187,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -190,7 +201,7 @@ ...@@ -190,7 +201,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -243,7 +254,7 @@ ...@@ -243,7 +254,7 @@
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops" InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -253,6 +264,9 @@ ...@@ -253,6 +264,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -265,7 +279,7 @@ ...@@ -265,7 +279,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -318,7 +332,7 @@ ...@@ -318,7 +332,7 @@
<Configuration <Configuration
Name="PGInstrument|Win32" Name="PGInstrument|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops" InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -328,6 +342,9 @@ ...@@ -328,6 +342,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -339,7 +356,7 @@ ...@@ -339,7 +356,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -392,7 +409,7 @@ ...@@ -392,7 +409,7 @@
<Configuration <Configuration
Name="PGInstrument|x64" Name="PGInstrument|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops" InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -402,6 +419,9 @@ ...@@ -402,6 +419,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -414,7 +434,7 @@ ...@@ -414,7 +434,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -467,7 +487,7 @@ ...@@ -467,7 +487,7 @@
<Configuration <Configuration
Name="PGUpdate|Win32" Name="PGUpdate|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops" InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -477,6 +497,9 @@ ...@@ -477,6 +497,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -488,7 +511,7 @@ ...@@ -488,7 +511,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -541,7 +564,7 @@ ...@@ -541,7 +564,7 @@
<Configuration <Configuration
Name="PGUpdate|x64" Name="PGUpdate|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops" InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -551,6 +574,9 @@ ...@@ -551,6 +574,9 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
<Tool
Name="MASM64"
/>
<Tool <Tool
Name="VCXMLDataGeneratorTool" Name="VCXMLDataGeneratorTool"
/> />
...@@ -563,7 +589,7 @@ ...@@ -563,7 +589,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -721,6 +747,74 @@ ...@@ -721,6 +747,74 @@
<File <File
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c" 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> </File>
</Filter> </Filter>
<Filter <Filter
......
<?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>
This diff is collapsed.
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Generating python_rc.h" 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> </Configuration>
</Configurations> </Configurations>
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="$(OutDir)" AdditionalLibraryDirectories="$(OutDir)"
/> />
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\PC;..\..\Include"
/>
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python25" Value="python25"
......
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -140,6 +142,7 @@ ...@@ -140,6 +142,7 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -212,6 +215,8 @@ ...@@ -212,6 +215,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -287,6 +292,7 @@ ...@@ -287,6 +292,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -361,6 +367,8 @@ ...@@ -361,6 +367,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -436,6 +444,7 @@ ...@@ -436,6 +444,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -510,6 +519,8 @@ ...@@ -510,6 +519,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -585,6 +596,7 @@ ...@@ -585,6 +596,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
......
...@@ -937,6 +937,10 @@ ...@@ -937,6 +937,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" 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}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File
RelativePath="..\..\PC\python_nt.rc"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Include" Name="Include"
......
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -140,6 +142,7 @@ ...@@ -140,6 +142,7 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -211,6 +214,8 @@ ...@@ -211,6 +214,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -285,6 +290,7 @@ ...@@ -285,6 +290,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -358,6 +364,8 @@ ...@@ -358,6 +364,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -432,6 +440,7 @@ ...@@ -432,6 +440,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -505,6 +514,8 @@ ...@@ -505,6 +514,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -579,6 +590,7 @@ ...@@ -579,6 +590,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" 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