]> granicus.if.org Git - python/commitdiff
Merging changes 55092, 55101,55120 from trunk, making PCBuild8 solution up to date.
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Sat, 5 May 2007 08:32:03 +0000 (08:32 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Sat, 5 May 2007 08:32:03 +0000 (08:32 +0000)
PCbuild8/_ctypes/_ctypes.vcproj
PCbuild8/_ctypes/_ctypes.vsprops [new file with mode: 0644]
PCbuild8/_ctypes/masm64.rules [new file with mode: 0644]
PCbuild8/make_versioninfo/make_versioninfo.vcproj
PCbuild8/pyproject.vsprops
PCbuild8/python/python.vcproj
PCbuild8/pythoncore/pythoncore.vcproj
PCbuild8/pythonw/pythonw.vcproj

index 36877edf97e99e48d16be45e4b630806112e52ad..85ca24bbee36d0f97165180e9e5549330b98cdd0 100644 (file)
                />\r
        </Platforms>\r
        <ToolFiles>\r
+               <ToolFile\r
+                       RelativePath=".\masm64.rules"\r
+               />\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\r
@@ -30,6 +33,9 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
@@ -42,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,9 +99,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+                               AdditionalIncludeDirectories=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                        <File\r
                                RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
                <Filter\r
diff --git a/PCbuild8/_ctypes/_ctypes.vsprops b/PCbuild8/_ctypes/_ctypes.vsprops
new file mode 100644 (file)
index 0000000..28155bd
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_ctypes"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/_ctypes/masm64.rules b/PCbuild8/_ctypes/masm64.rules
new file mode 100644 (file)
index 0000000..d25d86c
--- /dev/null
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<VisualStudioToolFile\r
+       Name="Microsoft Macro Assembler 64 bit"\r
+       Version="8.00"\r
+       >\r
+       <Rules>\r
+               <CustomBuildRule\r
+                       Name="MASM64"\r
+                       DisplayName="Microsoft Macro Assembler 64 bit"\r
+                       CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"\r
+                       Outputs="[$ObjectFileName]"\r
+                       FileExtensions="*.asm"\r
+                       ExecutionDescription="Assembling (x64) ..."\r
+                       >\r
+                       <Properties>\r
+                               <BooleanProperty\r
+                                       Name="NoLogo"\r
+                                       DisplayName="Suppress Startup Banner"\r
+                                       Description="Suppress the display of the startup banner and information messages.     (/nologo)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/nologo"\r
+                                       DefaultValue="true"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="ObjectFileName"\r
+                                       DisplayName="Object File Name"\r
+                                       PropertyPageName="Object File"\r
+                                       Description="Specifies the name of the output object file.     (/Fo:[file])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Fo&quot;[value]&quot;"\r
+                                       DefaultValue="$(IntDir)\$(InputName).obj"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="PreserveIdentifierCase"\r
+                                       DisplayName="Preserve Identifier Case"\r
+                                       Description="Specifies preservation of case of user identifiers.     (/Cp, /Cx)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       DefaultValue="0"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       DisplayName="Default"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/Cp"\r
+                                                       DisplayName="Preserves Identifier Case (/Cp)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/Cx"\r
+                                                       DisplayName="Preserves case in public and extern symbols. (/Cx)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <StringProperty\r
+                                       Name="PreprocessorDefinitions"\r
+                                       DisplayName="Preprocessor Definitions"\r
+                                       Description="Defines a text macro with the given name.     (/D[symbol])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/D&quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="GeneratePreprocessedSourceListing"\r
+                                       DisplayName="Generate Preprocessed Source Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Generates a preprocessed source listing to the Output Window.     (/EP)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/EP"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="AssembledCodeListingFile"\r
+                                       DisplayName="Assembled Code Listing File"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Generates an assembled code listing file.     (/Fl[file])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Fl&quot;[value]&quot;"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingLineWidth"\r
+                                       DisplayName="Source Listing Line Width"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width.     (/Sl [width])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sl [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingPageLength"\r
+                                       DisplayName="Source Listing Page Length"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length.     (/Sp [length])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sp [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="IncludePaths"\r
+                                       DisplayName="Include Paths"\r
+                                       Description="Sets path for include file. A maximum of 10 /I options is allowed.     (/I [path])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/I &quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="ListAllAvailableInformation"\r
+                                       DisplayName="List All Available Information"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on listing of all available information.     (/Sa)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sa"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="AddFirstPassListing"\r
+                                       DisplayName="Add First Pass Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Adds first-pass listing to listing file.     (/Sf)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sf"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="EnableAssemblyGeneratedCodeListing"\r
+                                       DisplayName="Enable Assembly Generated Code Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on listing of assembly-generated code.     (/Sg)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sg"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="DisableSymbolTable"\r
+                                       DisplayName="Disable Symbol Table"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns off symbol table when producing a listing.     (/Sn)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sn"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingSubTitle"\r
+                                       DisplayName="Source Listing Subtitle"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Specifies subtitle text for source listing. Same as SUBTITLE text.     (/Ss [subtitle])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Ss [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingTitle"\r
+                                       DisplayName="Source Listing Title"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Specifies title for source listing. Same as TITLE text.     (/St [title])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/St [value]"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="EnableFalseConditionalsInListing"\r
+                                       DisplayName="Enable False Conditionals In Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on false conditionals in listing.     (/Sx)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sx"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="WarningLevel"\r
+                                       DisplayName="Warning Level"\r
+                                       Description="Sets the warning level, where level = 0, 1, 2, or 3.    (/W0, /W1, /W2, /W3)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       DefaultValue="3"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="/W0"\r
+                                                       DisplayName="Warning Level 0 (/W0)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/W1"\r
+                                                       DisplayName="Warning Level 1 (/W1)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/W2"\r
+                                                       DisplayName="Warning Level 2 (/W2)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/W3"\r
+                                                       DisplayName="Warning Level 3 (/W3)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <BooleanProperty\r
+                                       Name="TreatWarningsAsErrors"\r
+                                       DisplayName="Treat Warnings As Errors"\r
+                                       Description="Returns an error code if warnings are generated.     (/WX)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/WX"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="MakeAllSymbolsPublic"\r
+                                       DisplayName="Make All Symbols Public"\r
+                                       PropertyPageName="Object File"\r
+                                       Description="Makes all symbols public.     (/Zf)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zf"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="GenerateDebugInformation"\r
+                                       DisplayName="Generate Debug Information"\r
+                                       Description="Generates Debug Information.     (/Zi)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zi"\r
+                                       DefaultValue="true"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="PackAlignmentBoundary"\r
+                                       DisplayName="Pack Alignment Boundary"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16.     (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       DisplayName="Default"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/Zp1"\r
+                                                       DisplayName="One Byte Boundary (/Zp1)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/Zp2"\r
+                                                       DisplayName="Two Byte Boundary (/Zp2)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/Zp4"\r
+                                                       DisplayName="Four Byte Boundary (/Zp4)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="4"\r
+                                                       Switch="/Zp8"\r
+                                                       DisplayName="Eight Byte Boundary (/Zp8)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="5"\r
+                                                       Switch="/Zp16"\r
+                                                       DisplayName="Sixteen Byte Boundary (/Zp16)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <BooleanProperty\r
+                                       Name="PerformSyntaxCheckOnly"\r
+                                       DisplayName="Perform Syntax Check Only"\r
+                                       Description="Performs a syntax check only.     (/Zs)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zs"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="ErrorReporting"\r
+                                       DisplayName="Error Reporting"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Reports internal assembler errors to Microsoft.     (/errorReport:[method])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="/errorReport:prompt"\r
+                                                       DisplayName="Prompt to send report immediately (/errorReport:prompt)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/errorReport:queue"\r
+                                                       DisplayName="Prompt to send report at the next logon (/errorReport:queue)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/errorReport:send"\r
+                                                       DisplayName="Automatically send report (/errorReport:send)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/errorReport:none"\r
+                                                       DisplayName="Do not send report (/errorReport:none)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <StringProperty\r
+                                       Name="BrowseFile"\r
+                                       DisplayName="Generate Browse Information File"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Specifies whether to generate browse information file and its optional name or location of the browse information file.     (/FR[name])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/FR&quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                       </Properties>\r
+               </CustomBuildRule>\r
+       </Rules>\r
+</VisualStudioToolFile>\r
index 95daa07addb61de93d4b8fe1853e7d7da0f02712..6e51944065bf598eaae5f86b4ff2488c2e84c6f8 100644 (file)
@@ -90,7 +90,7 @@
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                                Description="Generating python_rc.h"\r
-                               CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc_d.h&#x0D;&#x0A;"\r
+                               CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
index 7a1e96adbf8d4ac24cb802657a0d3b262eedf774..8f3d70675ad584b65e633a5da248ebadbe8dbd7f 100644 (file)
                Name="VCLinkerTool"\r
                AdditionalLibraryDirectories="$(OutDir)"\r
        />\r
+       <Tool\r
+               Name="VCResourceCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\PC;..\..\Include"\r
+       />\r
        <UserMacro\r
                Name="PyDllName"\r
                Value="python25"\r
index 5bf89123d607b14b69e0b562d967a6a03f7c7c6b..2ec1b8aef8a581bd68a83c1296c906c611d19c9b 100644 (file)
@@ -65,6 +65,8 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
index b6d3e4c26d91f0f183b822da7b2d78b15d8cea9b..5ede099fc13ffb2fa12c93bc42ad56d557e7822e 100644 (file)
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\PC\python_nt.rc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Include"\r
index fbf06a818846e5f9e280ccd9a78e91726e98f33a..9e2dc7bfce0cb5e71527328381537d5acdef3a45 100644 (file)
@@ -65,6 +65,8 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r