diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-09-05 17:58:12 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2006-09-05 17:58:12 (GMT) |
| commit | b15a0ccf6d5176a5064f63ddab7464c350611a2a (patch) | |
| tree | fe82d93423167bb8c254c17800432af407b89918 /PCbuild8 | |
| parent | e6728252a3598527bbda15c7ee17e03bf2c448f1 (diff) | |
| download | cpython-b15a0ccf6d5176a5064f63ddab7464c350611a2a.zip cpython-b15a0ccf6d5176a5064f63ddab7464c350611a2a.tar.gz cpython-b15a0ccf6d5176a5064f63ddab7464c350611a2a.tar.bz2 | |
Update the PCBuild8 solution.
Facilitate cross-compilation by having binaries in separate Win32 and x64 directories.
Rationalized configs by making proper use of platforms/configurations.
Remove pythoncore_pgo project.
Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation.
Removed I64 support, but this can be easily added by copying the x64 platform settings.
Diffstat (limited to 'PCbuild8')
| -rw-r--r-- | PCbuild8/_ctypes.vcproj | 100 | ||||
| -rw-r--r-- | PCbuild8/_ctypes_test.vcproj | 103 | ||||
| -rw-r--r-- | PCbuild8/_elementtree.vcproj | 80 | ||||
| -rw-r--r-- | PCbuild8/_msi.vcproj | 90 | ||||
| -rw-r--r-- | PCbuild8/_sqlite3.vcproj | 85 | ||||
| -rw-r--r-- | PCbuild8/make_buildinfo.c | 77 | ||||
| -rw-r--r-- | PCbuild8/make_buildinfo.vcproj | 81 | ||||
| -rw-r--r-- | PCbuild8/pcbuild.sln | 239 | ||||
| -rw-r--r-- | PCbuild8/python.vcproj | 105 | ||||
| -rw-r--r-- | PCbuild8/pythoncore.vcproj | 949 | ||||
| -rw-r--r-- | PCbuild8/pythoncore_pgo.vcproj | 781 | ||||
| -rw-r--r-- | PCbuild8/pythoncore_pgo_link.txt | 311 | ||||
| -rw-r--r-- | PCbuild8/pythonw.vcproj | 75 | ||||
| -rw-r--r-- | PCbuild8/readme.txt | 23 | ||||
| -rw-r--r-- | PCbuild8/select.vcproj | 105 | ||||
| -rw-r--r-- | PCbuild8/unicodedata.vcproj | 106 | ||||
| -rw-r--r-- | PCbuild8/w9xpopen.vcproj | 184 | ||||
| -rw-r--r-- | PCbuild8/winsound.vcproj | 88 |
18 files changed, 1764 insertions, 1818 deletions
diff --git a/PCbuild8/_ctypes.vcproj b/PCbuild8/_ctypes.vcproj index b09f5c2..80b9c64 100644 --- a/PCbuild8/_ctypes.vcproj +++ b/PCbuild8/_ctypes.vcproj @@ -4,20 +4,24 @@ Version="8,00" Name="_ctypes" ProjectGUID="{F22F40F4-D318-40DC-96B3-88DC81CE0894}" + RootNamespace="_ctypes" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_ctypes" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -63,14 +67,15 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes_d.pyd" + OutputFile="$(OutDir)\_ctypes_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_ctypes_d.pdb" + ProgramDatabaseFile="" SubSystem="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -99,9 +104,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_ctypes" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -120,19 +125,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -147,17 +153,16 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" + OutputFile="$(OutDir)\_ctypes_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="false" - ProgramDatabaseFile=".\./_ctypes.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -185,9 +190,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_ctypes" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -209,19 +214,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CompileAs="0" /> <Tool @@ -235,18 +237,19 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + OutputFile="$(OutDir)\_ctypes.pyd" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="false" - ProgramDatabaseFile=".\./_ctypes.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" SubSystem="0" OptimizeReferences="0" EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -274,9 +277,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="." - IntermediateDirectory="ia64-temp-release\_ctypes" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -295,22 +298,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" CompileAs="0" /> <Tool @@ -324,18 +325,19 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" - OutputFile="./_ctypes.pyd" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + OutputFile="$(OutDir)\_ctypes.pyd" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="false" - ProgramDatabaseFile=".\./_ctypes.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" SubSystem="0" OptimizeReferences="0" EnableCOMDATFolding="0" BaseAddress="0x1D1A0000" - ImportLibrary=".\./_ctypes.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/_ctypes_test.vcproj b/PCbuild8/_ctypes_test.vcproj index e4503ea..f252901 100644 --- a/PCbuild8/_ctypes_test.vcproj +++ b/PCbuild8/_ctypes_test.vcproj @@ -4,20 +4,24 @@ Version="8,00" Name="_ctypes_test" ProjectGUID="{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}" + RootNamespace="_ctypes_test" Keyword="Win32Proj" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_ctypes_test" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -62,13 +66,14 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./_ctypes_test_d.pyd" + OutputFile="$(OutDir)\_ctypes_test_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_ctypes_test_d.pdb" + ProgramDatabaseFile="" SubSystem="0" - ImportLibrary=".\./_ctypes_test_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -97,9 +102,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_ctypes_test" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -118,19 +123,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -144,16 +150,15 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./_ctypes_test.pyd" + OutputFile="$(OutDir)/_ctypes_test_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="false" - ProgramDatabaseFile=".\./_ctypes_test.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" SubSystem="0" - OptimizeReferences="0" - EnableCOMDATFolding="0" - ImportLibrary=".\./_ctypes_test.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -181,9 +186,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="." - IntermediateDirectory="ia64-temp-release\_ctypes_test" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -205,18 +210,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" - MinimalRebuild="false" - BasicRuntimeChecks="0" - RuntimeLibrary="3" - BufferSecurityCheck="false" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + DebugInformationFormat="0" CompileAs="0" /> <Tool @@ -230,15 +233,17 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile="./_ctypes_test_d.pyd" + OutputFile="$(OutDir)\_ctypes_test.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_ctypes_test_d.pdb" + ProgramDatabaseFile="" SubSystem="0" - ImportLibrary=".\./_ctypes_test_d.lib" - TargetMachine="0" + OptimizeReferences="0" + EnableCOMDATFolding="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -266,9 +271,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_ctypes_test" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" @@ -287,22 +292,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + DebugInformationFormat="0" CompileAs="0" /> <Tool @@ -316,17 +319,17 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile="./_ctypes_test.pyd" + OutputFile="$(OutDir)\_ctypes_test.pyd" LinkIncremental="1" SuppressStartupBanner="true" - GenerateDebugInformation="false" - ProgramDatabaseFile=".\./_ctypes_test.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" SubSystem="0" OptimizeReferences="0" EnableCOMDATFolding="0" - ImportLibrary=".\./_ctypes_test.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/_elementtree.vcproj b/PCbuild8/_elementtree.vcproj index a496f7a..d88c85f 100644 --- a/PCbuild8/_elementtree.vcproj +++ b/PCbuild8/_elementtree.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="_elementtree" ProjectGUID="{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}" + RootNamespace="_elementtree" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_elementtree" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -61,14 +65,15 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree_d.pyd" + OutputFile="$(OutDir)\_elementtree_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_elementtree_d.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -97,9 +102,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_elementtree" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -119,16 +124,14 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" @@ -147,15 +150,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" + OutputFile="$(OutDir)\_elementtree_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_elementtree.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -183,9 +187,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_elementtree" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -208,20 +212,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -236,17 +236,17 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" + OutputFile="$(OutDir)\_elementtree.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_elementtree.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -274,9 +274,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_elementtree" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -296,23 +296,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -327,17 +325,17 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile="./_elementtree.pyd" + OutputFile="$(OutDir)\_elementtree.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_elementtree.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D100000" - ImportLibrary=".\./_elementtree.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/_msi.vcproj b/PCbuild8/_msi.vcproj index 125db7d..ac9e079 100644 --- a/PCbuild8/_msi.vcproj +++ b/PCbuild8/_msi.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="_msi" ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}" + RootNamespace="_msi" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_msi" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -63,13 +67,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" - OutputFile="./_msi.pyd" + OutputFile="$(OutDir)\_msi.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_msi.pdb" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -98,9 +103,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_msi" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -121,19 +126,19 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -148,13 +153,15 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" - OutputFile="./_msi.pyd" + OutputFile="$(OutDir)\_msi.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./_msi.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -182,9 +189,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\_msi" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -208,21 +215,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -236,15 +238,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" - OutputFile="./_msi.pyd" + OutputFile="$(OutDir)\_msi.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./_msi.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -272,9 +275,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_msi" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -295,24 +298,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -326,15 +325,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" - OutputFile="./_msi.pyd" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + OutputFile="$(OutDir)\_msi.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./_msi.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./_msi.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/_sqlite3.vcproj b/PCbuild8/_sqlite3.vcproj index cd26b8b..3ede48f 100644 --- a/PCbuild8/_sqlite3.vcproj +++ b/PCbuild8/_sqlite3.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="_sqlite3" ProjectGUID="{2FF0A312-22F9-4C34-B070-842916DE27A9}" + RootNamespace="_sqlite3" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\_sqlite3" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -61,15 +65,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" - OutputFile="./_sqlite3_d.pyd" + OutputFile="$(OutDir)\_sqlite3_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_sqlite3_d.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -98,9 +103,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\_sqlite3" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -120,16 +125,14 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" @@ -148,16 +151,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" - OutputFile="./_sqlite3.pyd" + OutputFile="$(OutDir)\_sqlite3_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_sqlite3.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -185,9 +189,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\_sqlite3" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -210,20 +214,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -238,18 +238,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib" - OutputFile="./_sqlite3.pyd" + AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" + OutputFile="$(OutDir)\_sqlite3.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_sqlite3.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -277,9 +277,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\_sqlite3" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -299,23 +299,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -330,18 +327,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib" - OutputFile="./_sqlite3.pyd" + AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" + OutputFile="$(OutDir)\_sqlite3.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./_sqlite3.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1e180000" - ImportLibrary=".\./_sqlite3.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/make_buildinfo.c b/PCbuild8/make_buildinfo.c index 4cebf45..85416ed 100644 --- a/PCbuild8/make_buildinfo.c +++ b/PCbuild8/make_buildinfo.c @@ -3,19 +3,23 @@ #include <sys/stat.h> #include <stdio.h> -/* This file creates the getbuildinfo.o object, by first - invoking subwcrev.exe (if found), and then invoking cl.exe. - As a side effect, it might generate PCBuild\getbuildinfo2.c - also. If this isn't a subversion checkout, or subwcrev isn't - found, it compiles ..\\Modules\\getbuildinfo.c instead. +/* This file creates the getbuildinfo2.c file, by + invoking subwcrev.exe (if found). + If this isn't a subversion checkout, or subwcrev isn't + found, it copies ..\\Modules\\getbuildinfo.c instead. + + A file, getbuildinfo2.h is then updated to define + SUBWCREV if it was a subversion checkout. + + getbuildinfo2.c is part of the pythoncore project with + getbuildinfo2.h as a forced include. This helps + VisualStudio refrain from unnecessary compiles much of the + time. Currently, subwcrev.exe is found from the registry entries of TortoiseSVN. - No attempt is made to place getbuildinfo.o into the proper - binary directory. This isn't necessary, as this tool is - invoked as a pre-link step for pythoncore, so that overwrites - any previous getbuildinfo.o. + make_buildinfo.exe is called as a pre-build step for pythoncore. */ @@ -40,11 +44,11 @@ int make_buildinfo2() type != REG_SZ) /* Registry corrupted */ return 0; - strcat(command, "bin\\subwcrev.exe"); + strcat_s(command, sizeof(command), "bin\\subwcrev.exe"); if (_stat(command+1, &st) < 0) /* subwcrev.exe not part of the release */ return 0; - strcat(command, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); + strcat_s(command, sizeof(command), "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); puts(command); fflush(stdout); if (system(command) < 0) return 0; @@ -53,40 +57,25 @@ int make_buildinfo2() int main(int argc, char*argv[]) { - char command[500] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL "; - int do_unlink, result; - if (argc != 2) { - fprintf(stderr, "make_buildinfo $(ConfigurationName)\n"); - return EXIT_FAILURE; - } - if (strcmp(argv[1], "Release") == 0) { - strcat(command, "-MD "); - } - else if (strcmp(argv[1], "Debug") == 0) { - strcat(command, "-D_DEBUG -MDd "); - } - else if (strcmp(argv[1], "ReleaseItanium") == 0) { - strcat(command, "-MD /USECL:MS_ITANIUM "); - } - else if (strcmp(argv[1], "ReleaseAMD64") == 0) { - strcat(command, "-MD "); - strcat(command, "-MD /USECL:MS_OPTERON "); - } - else { - fprintf(stderr, "unsupported configuration %s\n", argv[1]); - return EXIT_FAILURE; - } + char command[500] = ""; + int svn; + FILE *f; - if ((do_unlink = make_buildinfo2())) - strcat(command, "getbuildinfo2.c -DSUBWCREV "); - else - strcat(command, "..\\Modules\\getbuildinfo.c"); - strcat(command, " -Fogetbuildinfo.o -I..\\Include -I..\\PC"); - puts(command); fflush(stdout); - result = system(command); - if (do_unlink) - unlink("getbuildinfo2.c"); - if (result < 0) + if (fopen_s(&f, "getbuildinfo2.h", "w")) return EXIT_FAILURE; + /* Get getbuildinfo.c from svn as getbuildinfo2.c */ + svn = make_buildinfo2(); + if (svn) { + puts("got getbuildinfo2.c from svn. Updating getbuildinfo2.h"); + /* yes. make sure SUBWCREV is defined */ + fprintf(f, "#define SUBWCREV\n"); + } else { + puts("didn't get getbuildinfo2.c from svn. Copying from Modules and clearing getbuildinfo2.h"); + strcat_s(command, sizeof(command), "copy ..\\Modules\\getbuildinfo.c getbuildinfo2.c"); + puts(command); fflush(stdout); + if (system(command) < 0) + return EXIT_FAILURE; + } + fclose(f); return 0; }
\ No newline at end of file diff --git a/PCbuild8/make_buildinfo.vcproj b/PCbuild8/make_buildinfo.vcproj index 5dc6bca..58ed000 100644 --- a/PCbuild8/make_buildinfo.vcproj +++ b/PCbuild8/make_buildinfo.vcproj @@ -4,6 +4,7 @@ Version="8,00" Name="make_buildinfo" ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}" + RootNamespace="make_buildinfo" Keyword="Win32Proj" > <Platforms> @@ -40,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -90,82 +91,8 @@ /> <Tool Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="." - IntermediateDirectory=".\x86-temp-release\make_buildinfo" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" - RuntimeLibrary="0" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/make_buildinfo.exe" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" + Description="Making getbuildinfo2.c" + CommandLine="$(TargetPath)" /> </Configuration> </Configurations> diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln index 9f47626..35d65a0 100644 --- a/PCbuild8/pcbuild.sln +++ b/PCbuild8/pcbuild.sln @@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" ProjectSection(ProjectDependencies) = postProject - {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E} + {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" @@ -61,137 +61,244 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution readme.txt = readme.txt EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore_pgo", "pythoncore_pgo.vcproj", "{8B59C1FF-2439-4BE9-9F24-84D4982D28D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + PGIRelease|Win32 = PGIRelease|Win32 + PGIRelease|x64 = PGIRelease|x64 + PGORelease|Win32 = PGORelease|Win32 + PGORelease|x64 = PGORelease|x64 Release|Win32 = Release|Win32 - ReleaseAMD64|Win32 = ReleaseAMD64|Win32 - ReleaseItanium|Win32 = ReleaseItanium|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|Win32.ActiveCfg = PGIRelease|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|Win32.Build.0 = PGIRelease|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|x64.ActiveCfg = PGIRelease|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|x64.Build.0 = PGIRelease|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|Win32.ActiveCfg = PGORelease|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|Win32.Build.0 = PGORelease|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|x64.ActiveCfg = PGORelease|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|x64.Build.0 = PGORelease|x64 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|Win32.Build.0 = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|x64.ActiveCfg = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|x64.Build.0 = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|Win32.ActiveCfg = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|Win32.Build.0 = Release|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|x64.ActiveCfg = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|x64.Build.0 = Release|x64 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32 {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|Win32.ActiveCfg = Debug|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|Win32.Build.0 = Debug|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|x64.ActiveCfg = Debug|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|x64.Build.0 = Debug|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|Win32.Build.0 = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|x64.ActiveCfg = Release|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|x64.Build.0 = Release|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|Win32.ActiveCfg = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|Win32.Build.0 = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|x64.ActiveCfg = Release|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|x64.Build.0 = Release|x64 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|Win32.ActiveCfg = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|Win32.Build.0 = Release|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|x64.ActiveCfg = Release|x64 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|x64.Build.0 = Release|x64 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|Win32.ActiveCfg = Debug|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|Win32.Build.0 = Debug|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|x64.ActiveCfg = Debug|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|x64.Build.0 = Debug|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|Win32.Build.0 = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|x64.ActiveCfg = Release|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|x64.Build.0 = Release|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|Win32.ActiveCfg = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|Win32.Build.0 = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|x64.ActiveCfg = Release|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|x64.Build.0 = Release|x64 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|Win32.ActiveCfg = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|Win32.Build.0 = Release|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|x64.ActiveCfg = Release|x64 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|x64.Build.0 = Release|x64 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|Win32.Build.0 = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|x64.ActiveCfg = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|x64.Build.0 = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|Win32.ActiveCfg = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|Win32.Build.0 = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|x64.ActiveCfg = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|x64.Build.0 = Release|x64 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseItanium|Win32.ActiveCfg = Release|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|Win32.ActiveCfg = Debug|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|Win32.Build.0 = Debug|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|x64.ActiveCfg = Debug|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|x64.Build.0 = Debug|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|Win32.Build.0 = Release|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|x64.ActiveCfg = Release|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|x64.Build.0 = Release|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|Win32.ActiveCfg = Release|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|Win32.Build.0 = Release|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|x64.ActiveCfg = Release|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|x64.Build.0 = Release|x64 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|Win32.ActiveCfg = Release|Win32 {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|Win32.Build.0 = Release|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|x64.ActiveCfg = Release|x64 + {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|x64.Build.0 = Release|x64 {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|Win32.ActiveCfg = Debug|Win32 {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|Win32.Build.0 = Debug|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|x64.ActiveCfg = Debug|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|x64.Build.0 = Debug|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|Win32.Build.0 = Release|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|x64.ActiveCfg = Release|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|x64.Build.0 = Release|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|Win32.ActiveCfg = Release|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|Win32.Build.0 = Release|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|x64.ActiveCfg = Release|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|x64.Build.0 = Release|x64 {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|Win32.ActiveCfg = Release|Win32 {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|Win32.Build.0 = Release|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|x64.ActiveCfg = Release|x64 + {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|x64.Build.0 = Release|x64 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Debug|Win32 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Debug|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseAMD64|Win32.Build.0 = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium|Win32.Build.0 = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|Win32.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|Win32.Build.0 = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|x64.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|Win32.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|Win32.Build.0 = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|x64.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Debug|Win32 {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|Win32.ActiveCfg = Debug|Win32 {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|Win32.Build.0 = Debug|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|x64.ActiveCfg = Debug|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|x64.Build.0 = Debug|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|Win32.Build.0 = Release|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|x64.ActiveCfg = Release|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|x64.Build.0 = Release|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|Win32.ActiveCfg = Release|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|Win32.Build.0 = Release|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|x64.ActiveCfg = Release|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|x64.Build.0 = Release|x64 {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|Win32.ActiveCfg = Release|Win32 {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|Win32.Build.0 = Release|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|x64.ActiveCfg = Release|x64 + {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|x64.Build.0 = Release|x64 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|Win32.ActiveCfg = Debug|Win32 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|Win32.Build.0 = Debug|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|x64.ActiveCfg = Debug|x64 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|x64.Build.0 = Debug|x64 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|Win32.Build.0 = Release|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|x64.ActiveCfg = Release|x64 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|x64.Build.0 = Release|x64 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|Win32.ActiveCfg = Release|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|Win32.Build.0 = Release|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|x64.ActiveCfg = Release|x64 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|x64.Build.0 = Release|x64 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|Win32.ActiveCfg = Release|Win32 {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|Win32.Build.0 = Release|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {F22F40F4-D318-40DC-96B3-88DC81CE0894}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 + {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|x64.ActiveCfg = Release|x64 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|Win32.ActiveCfg = Debug|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|Win32.Build.0 = Debug|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|x64.ActiveCfg = Debug|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|x64.Build.0 = Debug|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|Win32.Build.0 = Release|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|x64.ActiveCfg = Release|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|x64.Build.0 = Release|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|Win32.ActiveCfg = Release|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|Win32.Build.0 = Release|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|x64.ActiveCfg = Release|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|x64.Build.0 = Release|x64 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|Win32.ActiveCfg = Release|Win32 {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|Win32.Build.0 = Release|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|x64.ActiveCfg = Release|x64 + {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|x64.Build.0 = Release|x64 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|Win32.ActiveCfg = Debug|Win32 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|Win32.Build.0 = Debug|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|x64.ActiveCfg = Debug|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|x64.Build.0 = Debug|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|Win32.Build.0 = Release|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|x64.ActiveCfg = Release|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|x64.Build.0 = Release|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|Win32.ActiveCfg = Release|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|Win32.Build.0 = Release|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|x64.ActiveCfg = Release|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|x64.Build.0 = Release|x64 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|Win32.ActiveCfg = Release|Win32 {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|Win32.Build.0 = Release|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {2FF0A312-22F9-4C34-B070-842916DE27A9}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.Debug|Win32.ActiveCfg = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.Debug|Win32.Build.0 = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.Release|Win32.ActiveCfg = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.Release|Win32.Build.0 = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.ReleaseAMD64|Win32.Build.0 = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.ReleaseItanium|Win32.ActiveCfg = Release|Win32 - {8B59C1FF-2439-4BE9-9F24-84D4982D28D4}.ReleaseItanium|Win32.Build.0 = Release|Win32 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|x64.ActiveCfg = Release|x64 + {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|x64.Build.0 = Release|x64 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|Win32.Build.0 = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|x64.ActiveCfg = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|x64.Build.0 = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|Win32.ActiveCfg = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|Win32.Build.0 = Release|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|x64.ActiveCfg = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|x64.Build.0 = Release|x64 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium|Win32.ActiveCfg = ReleaseItanium|Win32 - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.ReleaseItanium|Win32.Build.0 = ReleaseItanium|Win32 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|x64.ActiveCfg = Release|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseAMD64|Win32.Build.0 = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.ReleaseItanium|Win32.Build.0 = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PCbuild8/python.vcproj b/PCbuild8/python.vcproj index 555df91..7fa8d04 100644 --- a/PCbuild8/python.vcproj +++ b/PCbuild8/python.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="python" ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" + RootNamespace="python" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\python" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -67,11 +71,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" + OutputFile="$(OutDir)\python.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python.pdb" + ProgramDatabaseFile="" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -103,9 +108,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\python" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -126,15 +131,18 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" - BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -145,9 +153,8 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include" /> <Tool Name="VCPreLinkEventTool" @@ -155,15 +162,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./python_d.exe" + OutputFile="$(OutDir)\python.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python_d.pdb" + ProgramDatabaseFile="" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -191,9 +199,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\python" + Name="Debug|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -217,20 +225,14 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + RuntimeLibrary="3" UsePrecompiledHeader="0" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -239,25 +241,26 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" + AdditionalIncludeDirectories="..\Include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" + OutputFile="$(OutDir)\python_d.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python.pdb" + ProgramDatabaseFile="" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -285,9 +288,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\python" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -308,23 +311,18 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + RuntimeLibrary="3" UsePrecompiledHeader="0" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -333,25 +331,26 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" + AdditionalIncludeDirectories="..\Include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" + AdditionalDependencies="odbccp32.lib python26_d.lib" + OutputFile="$(OutDir)\python_d.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python.pdb" + ProgramDatabaseFile="" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/pythoncore.vcproj b/PCbuild8/pythoncore.vcproj index 5fa154b..f335879 100644 --- a/PCbuild8/pythoncore.vcproj +++ b/PCbuild8/pythoncore.vcproj @@ -10,14 +10,17 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\pythoncore" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -25,6 +28,7 @@ > <Tool Name="VCPreBuildEventTool" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -66,22 +70,20 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)
" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25.dll" + OutputFile="$(OutDir)\python26.dll" LinkIncremental="1" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python25.pdb" + ProgramDatabaseFile="" SubSystem="2" LinkTimeCodeGeneration="0" BaseAddress="0x1e000000" - ImportLibrary=".\./python25.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -110,9 +112,106 @@ /> </Configuration> <Configuration + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + Optimization="2" + InlineFunctionExpansion="1" + WholeProgramOptimization="false" + AdditionalIncludeDirectories="..\Include,..\PC" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\python26.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + SubSystem="2" + LinkTimeCodeGeneration="0" + BaseAddress="0x1e000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\pythoncore" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -162,16 +261,15 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25_d.dll" + OutputFile="$(OutDir)\python26_d.dll" LinkIncremental="1" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python25_d.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python25_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -200,9 +298,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory="./." - IntermediateDirectory=".\ia64-temp-release\pythoncore" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -222,23 +320,112 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" + AdditionalOptions="/Zm200 " + Optimization="0" + AdditionalIncludeDirectories="..\Include,..\PC" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\python26_d.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + SubSystem="2" + BaseAddress="0x1e000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGIRelease|Win32" + OutputDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + Description="Get getbuildinfo2.c" + CommandLine="make_buildinfo.exe" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " Optimization="2" InlineFunctionExpansion="1" + WholeProgramOptimization="true" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -253,23 +440,118 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)" + CommandLine="" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/python26.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + SubSystem="2" + LinkTimeCodeGeneration="2" + BaseAddress="0x1e000000" + ImportLibrary="" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="PGIRelease|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + Description="Get getbuildinfo2.c" + CommandLine="make_buildinfo.exe" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + Optimization="2" + InlineFunctionExpansion="1" + WholeProgramOptimization="true" + AdditionalIncludeDirectories="..\Include,..\PC" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25.dll" + OutputFile="$(OutDir)/python26.dll" LinkIncremental="1" - SuppressStartupBanner="false" + SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python25.pdb" + ProgramDatabaseFile="" SubSystem="2" + LinkTimeCodeGeneration="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python25.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -294,16 +576,19 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="" /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="./." - IntermediateDirectory=".\amd64-temp-release\pythoncore" + Name="PGORelease|Win32" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\PGIRelease\pythoncore" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" + BuildLogFile="$(OutDir)\BuildLog.htm" + ExcludeBuckets="7" > <Tool Name="VCPreBuildEventTool" @@ -322,20 +607,18 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/Zm200 /USECL:MS_OPTERON /GS-" + AdditionalOptions="/Zm200 " Optimization="2" InlineFunctionExpansion="1" + WholeProgramOptimization="true" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -350,23 +633,119 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="make_buildinfo.exe $(ConfigurationName)" + CommandLine="copy $(PlatformName)\python.exe $(IntDir)
$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1
" /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25.dll" + OutputFile="$(OutDir)\python26.dll" LinkIncremental="1" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./python25.pdb" + ProgramDatabaseFile="" SubSystem="2" + LinkTimeCodeGeneration="3" + ProfileGuidedDatabase="$(IntDir)\$(TargetName).pgd" BaseAddress="0x1e000000" - ImportLibrary=".\./python25.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGORelease|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + BuildLogFile="$(OutDir)\BuildLog.htm" + ExcludeBuckets="7" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + Optimization="2" + InlineFunctionExpansion="1" + WholeProgramOptimization="true" + AdditionalIncludeDirectories="..\Include,..\PC" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="copy $(PlatformName)\python.exe $(IntDir)
$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1
" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\python26.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="libc" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + SubSystem="2" + LinkTimeCodeGeneration="3" + ProfileGuidedDatabase="$(IntDir)\$(TargetName).pgd" + BaseAddress="0x1e000000" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -456,6 +835,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\zlib" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool @@ -464,7 +851,31 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseItanium|Win32" + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\zlib" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\zlib" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\zlib" + /> + </FileConfiguration> + <FileConfiguration + Name="PGORelease|Win32" > <Tool Name="VCCLCompilerTool" @@ -472,7 +883,7 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseAMD64|Win32" + Name="PGORelease|x64" > <Tool Name="VCCLCompilerTool" @@ -485,6 +896,334 @@ > </File> </Filter> + <Filter + Name="include files" + > + <File + RelativePath="..\Include\abstract.h" + > + </File> + <File + RelativePath="..\Include\asdl.h" + > + </File> + <File + RelativePath="..\Include\ast.h" + > + </File> + <File + RelativePath="..\Include\bitset.h" + > + </File> + <File + RelativePath="..\Include\boolobject.h" + > + </File> + <File + RelativePath="..\Include\bufferobject.h" + > + </File> + <File + RelativePath="..\Include\cellobject.h" + > + </File> + <File + RelativePath="..\Include\ceval.h" + > + </File> + <File + RelativePath="..\Include\classobject.h" + > + </File> + <File + RelativePath="..\Include\cobject.h" + > + </File> + <File + RelativePath="..\Include\code.h" + > + </File> + <File + RelativePath="..\Include\codecs.h" + > + </File> + <File + RelativePath="..\Include\compile.h" + > + </File> + <File + RelativePath="..\Include\complexobject.h" + > + </File> + <File + RelativePath="..\Include\cStringIO.h" + > + </File> + <File + RelativePath="..\Include\datetime.h" + > + </File> + <File + RelativePath="..\Include\descrobject.h" + > + </File> + <File + RelativePath="..\Include\dictobject.h" + > + </File> + <File + RelativePath="..\Include\enumobject.h" + > + </File> + <File + RelativePath="..\Include\errcode.h" + > + </File> + <File + RelativePath="..\Include\eval.h" + > + </File> + <File + RelativePath="..\Include\fileobject.h" + > + </File> + <File + RelativePath="..\Include\floatobject.h" + > + </File> + <File + RelativePath="..\Include\frameobject.h" + > + </File> + <File + RelativePath="..\Include\funcobject.h" + > + </File> + <File + RelativePath="..\Include\genobject.h" + > + </File> + <File + RelativePath="..\Include\graminit.h" + > + </File> + <File + RelativePath="..\Include\grammar.h" + > + </File> + <File + RelativePath="..\Include\import.h" + > + </File> + <File + RelativePath="..\Include\intobject.h" + > + </File> + <File + RelativePath="..\Include\intrcheck.h" + > + </File> + <File + RelativePath="..\Include\iterobject.h" + > + </File> + <File + RelativePath="..\Include\listobject.h" + > + </File> + <File + RelativePath="..\Include\longintrepr.h" + > + </File> + <File + RelativePath="..\Include\longobject.h" + > + </File> + <File + RelativePath="..\Include\marshal.h" + > + </File> + <File + RelativePath="..\Include\metagrammar.h" + > + </File> + <File + RelativePath="..\Include\methodobject.h" + > + </File> + <File + RelativePath="..\Include\modsupport.h" + > + </File> + <File + RelativePath="..\Include\moduleobject.h" + > + </File> + <File + RelativePath="..\Include\node.h" + > + </File> + <File + RelativePath="..\Include\object.h" + > + </File> + <File + RelativePath="..\Include\objimpl.h" + > + </File> + <File + RelativePath="..\Include\opcode.h" + > + </File> + <File + RelativePath="..\Include\osdefs.h" + > + </File> + <File + RelativePath="..\Include\parsetok.h" + > + </File> + <File + RelativePath="..\Include\patchlevel.h" + > + </File> + <File + RelativePath="..\Include\pgen.h" + > + </File> + <File + RelativePath="..\Include\pgenheaders.h" + > + </File> + <File + RelativePath="..\Include\py_curses.h" + > + </File> + <File + RelativePath="..\Include\pyarena.h" + > + </File> + <File + RelativePath="..\PC\pyconfig.h" + > + </File> + <File + RelativePath="..\Include\pydebug.h" + > + </File> + <File + RelativePath="..\Include\pyerrors.h" + > + </File> + <File + RelativePath="..\Include\pyexpat.h" + > + </File> + <File + RelativePath="..\Include\pyfpe.h" + > + </File> + <File + RelativePath="..\Include\pygetopt.h" + > + </File> + <File + RelativePath="..\Include\pymactoolbox.h" + > + </File> + <File + RelativePath="..\Include\pymem.h" + > + </File> + <File + RelativePath="..\Include\pyport.h" + > + </File> + <File + RelativePath="..\Include\pystate.h" + > + </File> + <File + RelativePath="..\Include\pystrtod.h" + > + </File> + <File + RelativePath="..\Include\Python-ast.h" + > + </File> + <File + RelativePath="..\Include\Python.h" + > + </File> + <File + RelativePath="..\Include\pythonrun.h" + > + </File> + <File + RelativePath="..\Include\pythread.h" + > + </File> + <File + RelativePath="..\Include\rangeobject.h" + > + </File> + <File + RelativePath="..\Include\setobject.h" + > + </File> + <File + RelativePath="..\Include\sliceobject.h" + > + </File> + <File + RelativePath="..\Include\stringobject.h" + > + </File> + <File + RelativePath="..\Include\structmember.h" + > + </File> + <File + RelativePath="..\Include\structseq.h" + > + </File> + <File + RelativePath="..\Include\symtable.h" + > + </File> + <File + RelativePath="..\Include\sysmodule.h" + > + </File> + <File + RelativePath="..\Include\timefuncs.h" + > + </File> + <File + RelativePath="..\Include\token.h" + > + </File> + <File + RelativePath="..\Include\traceback.h" + > + </File> + <File + RelativePath="..\Include\tupleobject.h" + > + </File> + <File + RelativePath="..\Include\ucnhash.h" + > + </File> + <File + RelativePath="..\Include\unicodeobject.h" + > + </File> + <File + RelativePath="..\Include\weakrefobject.h" + > + </File> + </Filter> <File RelativePath="..\Modules\_bisectmodule.c" > @@ -558,6 +1297,10 @@ > </File> <File + RelativePath="..\Modules\_typesmodule.c" + > + </File> + <File RelativePath="..\Modules\_weakref.c" > </File> @@ -738,6 +1481,74 @@ > </File> <File + RelativePath=".\getbuildinfo2.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|x64" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="PGORelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + <FileConfiguration + Name="PGORelease|x64" + > + <Tool + Name="VCCLCompilerTool" + ForcedIncludeFiles="getbuildinfo2.h" + /> + </FileConfiguration> + </File> + <File RelativePath="..\Python\getcompiler.c" > </File> @@ -797,6 +1608,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Python" + /> + </FileConfiguration> + <FileConfiguration Name="Debug|Win32" > <Tool @@ -805,7 +1624,23 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseItanium|Win32" + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Python" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Python" + /> + </FileConfiguration> + <FileConfiguration + Name="PGIRelease|x64" > <Tool Name="VCCLCompilerTool" @@ -813,7 +1648,15 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseAMD64|Win32" + Name="PGORelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Python" + /> + </FileConfiguration> + <FileConfiguration + Name="PGORelease|x64" > <Tool Name="VCCLCompilerTool" @@ -938,6 +1781,10 @@ > </File> <File + RelativePath="..\Python\peephole.c" + > + </File> + <File RelativePath="..\Modules\posixmodule.c" > </File> diff --git a/PCbuild8/pythoncore_pgo.vcproj b/PCbuild8/pythoncore_pgo.vcproj deleted file mode 100644 index 9a312ad..0000000 --- a/PCbuild8/pythoncore_pgo.vcproj +++ /dev/null @@ -1,781 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="pythoncore_pgo" - ProjectGUID="{8B59C1FF-2439-4BE9-9F24-84D4982D28D4}" - RootNamespace="pythoncore_pgo" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(ProjectName)" - IntermediateDirectory=".\x86-temp-release\$(ProjectName)" - ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zm200 " - Optimization="2" - InlineFunctionExpansion="1" - WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - SuppressStartupBanner="true" - DebugInformationFormat="3" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - AdditionalIncludeDirectories="..\Include" - /> - <Tool - Name="VCPreLinkEventTool" - Description="Generate buildinfo & profile guided optimizations (please be patient)" - CommandLine="make_buildinfo.exe $(ConfigurationName)
link @$(ProjectName)_link.txt
$(OutDir)\python ../Tools/pybench/pybench.py -n 1
" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="getbuildinfo.o" - OutputFile="$(OutDir)/python25.dll" - LinkIncremental="1" - SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libc" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/python25.pdb" - SubSystem="2" - LinkTimeCodeGeneration="3" - BaseAddress="0x1e000000" - ImportLibrary="$(OutDir)/python25.lib" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="zlib" - > - <File - RelativePath="..\Modules\zlib\adler32.c" - > - </File> - <File - RelativePath="..\Modules\zlib\compress.c" - > - </File> - <File - RelativePath="..\Modules\zlib\crc32.c" - > - </File> - <File - RelativePath="..\Modules\zlib\deflate.c" - > - </File> - <File - RelativePath="..\Modules\zlib\gzio.c" - > - </File> - <File - RelativePath="..\Modules\zlib\infback.c" - > - </File> - <File - RelativePath="..\Modules\zlib\inffast.c" - > - </File> - <File - RelativePath="..\Modules\zlib\inflate.c" - > - </File> - <File - RelativePath="..\Modules\zlib\inftrees.c" - > - </File> - <File - RelativePath="..\Modules\zlib\trees.c" - > - </File> - <File - RelativePath="..\Modules\zlib\uncompr.c" - > - </File> - <File - RelativePath="..\Modules\zlibmodule.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Modules\zlib" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\Modules\zlib\zutil.c" - > - </File> - </Filter> - <File - RelativePath="..\Modules\_bisectmodule.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_cn.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_hk.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_jp.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_kr.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\_codecs_tw.c" - > - </File> - <File - RelativePath="..\Modules\_codecsmodule.c" - > - </File> - <File - RelativePath="..\Modules\_csv.c" - > - </File> - <File - RelativePath="..\Modules\_functoolsmodule.c" - > - </File> - <File - RelativePath="..\Modules\_heapqmodule.c" - > - </File> - <File - RelativePath="..\Modules\_hotshot.c" - > - </File> - <File - RelativePath="..\Modules\_localemodule.c" - > - </File> - <File - RelativePath="..\Modules\_lsprof.c" - > - </File> - <File - RelativePath="..\Modules\_randommodule.c" - > - </File> - <File - RelativePath="..\Modules\_sre.c" - > - </File> - <File - RelativePath="..\Modules\_struct.c" - > - </File> - <File - RelativePath="..\Pc\_subprocess.c" - > - </File> - <File - RelativePath="..\Modules\_weakref.c" - > - </File> - <File - RelativePath="..\Pc\_winreg.c" - > - </File> - <File - RelativePath="..\Objects\abstract.c" - > - </File> - <File - RelativePath="..\Parser\acceler.c" - > - </File> - <File - RelativePath="..\Modules\arraymodule.c" - > - </File> - <File - RelativePath="..\Python\asdl.c" - > - </File> - <File - RelativePath="..\Python\ast.c" - > - </File> - <File - RelativePath="..\Modules\audioop.c" - > - </File> - <File - RelativePath="..\Modules\binascii.c" - > - </File> - <File - RelativePath="..\Parser\bitset.c" - > - </File> - <File - RelativePath="..\Python\bltinmodule.c" - > - </File> - <File - RelativePath="..\Objects\boolobject.c" - > - </File> - <File - RelativePath="..\Objects\bufferobject.c" - > - </File> - <File - RelativePath="..\Objects\cellobject.c" - > - </File> - <File - RelativePath="..\Python\ceval.c" - > - </File> - <File - RelativePath="..\Objects\classobject.c" - > - </File> - <File - RelativePath="..\Modules\cmathmodule.c" - > - </File> - <File - RelativePath="..\Objects\cobject.c" - > - </File> - <File - RelativePath="..\Python\codecs.c" - > - </File> - <File - RelativePath="..\Objects\codeobject.c" - > - </File> - <File - RelativePath="..\Modules\collectionsmodule.c" - > - </File> - <File - RelativePath="..\Python\compile.c" - > - </File> - <File - RelativePath="..\Objects\complexobject.c" - > - </File> - <File - RelativePath="..\PC\config.c" - > - </File> - <File - RelativePath="..\Modules\cPickle.c" - > - </File> - <File - RelativePath="..\Modules\cStringIO.c" - > - </File> - <File - RelativePath="..\Modules\datetimemodule.c" - > - </File> - <File - RelativePath="..\Objects\descrobject.c" - > - </File> - <File - RelativePath="..\Objects\dictobject.c" - > - </File> - <File - RelativePath="..\PC\dl_nt.c" - > - </File> - <File - RelativePath="..\Python\dynload_win.c" - > - </File> - <File - RelativePath="..\Objects\enumobject.c" - > - </File> - <File - RelativePath="..\Modules\errnomodule.c" - > - </File> - <File - RelativePath="..\Python\errors.c" - > - </File> - <File - RelativePath="..\Objects\exceptions.c" - > - </File> - <File - RelativePath="..\Objects\fileobject.c" - > - </File> - <File - RelativePath="..\Parser\firstsets.c" - > - </File> - <File - RelativePath="..\Objects\floatobject.c" - > - </File> - <File - RelativePath="..\Objects\frameobject.c" - > - </File> - <File - RelativePath="..\Python\frozen.c" - > - </File> - <File - RelativePath="..\Objects\funcobject.c" - > - </File> - <File - RelativePath="..\Python\future.c" - > - </File> - <File - RelativePath="..\Modules\gcmodule.c" - > - </File> - <File - RelativePath="..\Objects\genobject.c" - > - </File> - <File - RelativePath="..\Python\getargs.c" - > - </File> - <File - RelativePath="..\Python\getcompiler.c" - > - </File> - <File - RelativePath="..\Python\getcopyright.c" - > - </File> - <File - RelativePath="..\Python\getmtime.c" - > - </File> - <File - RelativePath="..\Python\getopt.c" - > - </File> - <File - RelativePath="..\PC\getpathp.c" - > - </File> - <File - RelativePath="..\Python\getplatform.c" - > - </File> - <File - RelativePath="..\Python\getversion.c" - > - </File> - <File - RelativePath="..\Python\graminit.c" - > - </File> - <File - RelativePath="..\Parser\grammar.c" - > - </File> - <File - RelativePath="..\Parser\grammar1.c" - > - </File> - <File - RelativePath="..\Modules\imageop.c" - > - </File> - <File - RelativePath="..\Python\import.c" - > - </File> - <File - RelativePath="..\PC\import_nt.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\Python" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\Python\importdl.c" - > - </File> - <File - RelativePath="..\Objects\intobject.c" - > - </File> - <File - RelativePath="..\Objects\iterobject.c" - > - </File> - <File - RelativePath="..\Modules\itertoolsmodule.c" - > - </File> - <File - RelativePath="..\Parser\listnode.c" - > - </File> - <File - RelativePath="..\Objects\listobject.c" - > - </File> - <File - RelativePath="..\Objects\longobject.c" - > - </File> - <File - RelativePath="..\Modules\main.c" - > - </File> - <File - RelativePath="..\Python\marshal.c" - > - </File> - <File - RelativePath="..\Modules\mathmodule.c" - > - </File> - <File - RelativePath="..\Modules\md5.c" - > - </File> - <File - RelativePath="..\Modules\md5module.c" - > - </File> - <File - RelativePath="..\Parser\metagrammar.c" - > - </File> - <File - RelativePath="..\Objects\methodobject.c" - > - </File> - <File - RelativePath="..\Modules\mmapmodule.c" - > - </File> - <File - RelativePath="..\Python\modsupport.c" - > - </File> - <File - RelativePath="..\Objects\moduleobject.c" - > - </File> - <File - RelativePath="..\PC\msvcrtmodule.c" - > - </File> - <File - RelativePath="..\Modules\cjkcodecs\multibytecodec.c" - > - </File> - <File - RelativePath="..\Parser\myreadline.c" - > - </File> - <File - RelativePath="..\Python\mysnprintf.c" - > - </File> - <File - RelativePath="..\Python\mystrtoul.c" - > - </File> - <File - RelativePath="..\Parser\node.c" - > - </File> - <File - RelativePath="..\Objects\object.c" - > - </File> - <File - RelativePath="..\Objects\obmalloc.c" - > - </File> - <File - RelativePath="..\Modules\operator.c" - > - </File> - <File - RelativePath="..\Parser\parser.c" - > - </File> - <File - RelativePath="..\Modules\parsermodule.c" - > - </File> - <File - RelativePath="..\Parser\parsetok.c" - > - </File> - <File - RelativePath="..\Modules\posixmodule.c" - > - </File> - <File - RelativePath="..\Python\pyarena.c" - > - </File> - <File - RelativePath="..\Python\pyfpe.c" - > - </File> - <File - RelativePath="..\Python\pystate.c" - > - </File> - <File - RelativePath="..\Python\pystrtod.c" - > - </File> - <File - RelativePath="..\Python\Python-ast.c" - > - </File> - <File - RelativePath="..\PCbuild8\python.exe" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="xcopy $(InputFileName)* $(OutDir) /F /I /Y
" - Outputs="$(OutDir)\$(InputFileName)" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\PC\python_nt.rc" - > - </File> - <File - RelativePath="..\Python\pythonrun.c" - > - </File> - <File - RelativePath="..\Objects\rangeobject.c" - > - </File> - <File - RelativePath="..\Modules\rgbimgmodule.c" - > - </File> - <File - RelativePath="..\Modules\rotatingtree.c" - > - </File> - <File - RelativePath="..\Objects\setobject.c" - > - </File> - <File - RelativePath="..\Modules\sha256module.c" - > - </File> - <File - RelativePath="..\Modules\sha512module.c" - > - </File> - <File - RelativePath="..\Modules\sha512module.c" - > - </File> - <File - RelativePath="..\Modules\shamodule.c" - > - </File> - <File - RelativePath="..\Modules\signalmodule.c" - > - </File> - <File - RelativePath="..\Modules\signalmodule.c" - > - </File> - <File - RelativePath="..\Objects\sliceobject.c" - > - </File> - <File - RelativePath="..\Objects\stringobject.c" - > - </File> - <File - RelativePath="..\Modules\stropmodule.c" - > - </File> - <File - RelativePath="..\Python\structmember.c" - > - </File> - <File - RelativePath="..\Objects\structseq.c" - > - </File> - <File - RelativePath="..\Python\symtable.c" - > - </File> - <File - RelativePath="..\Modules\symtablemodule.c" - > - </File> - <File - RelativePath="..\Python\sysmodule.c" - > - </File> - <File - RelativePath="..\Python\thread.c" - > - </File> - <File - RelativePath="..\Modules\threadmodule.c" - > - </File> - <File - RelativePath="..\Modules\timemodule.c" - > - </File> - <File - RelativePath="..\Parser\tokenizer.c" - > - </File> - <File - RelativePath="..\Python\traceback.c" - > - </File> - <File - RelativePath="..\Objects\tupleobject.c" - > - </File> - <File - RelativePath="..\Objects\typeobject.c" - > - </File> - <File - RelativePath="..\Objects\unicodectype.c" - > - </File> - <File - RelativePath="..\Objects\unicodeobject.c" - > - </File> - <File - RelativePath="..\Objects\weakrefobject.c" - > - </File> - <File - RelativePath="..\Modules\xxsubtype.c" - > - </File> - <File - RelativePath="..\Modules\yuvconvert.c" - > - </File> - <File - RelativePath="..\Modules\zipimport.c" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/PCbuild8/pythoncore_pgo_link.txt b/PCbuild8/pythoncore_pgo_link.txt deleted file mode 100644 index cf43e6f..0000000 --- a/PCbuild8/pythoncore_pgo_link.txt +++ /dev/null @@ -1,311 +0,0 @@ -/OUT:".\pythoncore_pgo/python25.dll" /INCREMENTAL:NO /DLL /MANIFEST /MANIFESTFILE:".\x86-temp-release\pythoncore_pgo\python25.dll.intermediate.manifest" /NODEFAULTLIB:"libc" /DEBUG /PDB:".\pythoncore_pgo/python25.pdb" /SUBSYSTEM:WINDOWS /LTCG:PGINSTRUMENT /PGD:".\pythoncore_pgo\python25.pgd" /BASE:"0x1e000000" /IMPLIB:"pythoncore_pgo/python25.lib" /MACHINE:X86 getbuildinfo.o kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib - -".\x86-temp-release\pythoncore_pgo\adler32.obj" - -".\x86-temp-release\pythoncore_pgo\compress.obj" - -".\x86-temp-release\pythoncore_pgo\crc32.obj" - -".\x86-temp-release\pythoncore_pgo\deflate.obj" - -".\x86-temp-release\pythoncore_pgo\gzio.obj" - -".\x86-temp-release\pythoncore_pgo\infback.obj" - -".\x86-temp-release\pythoncore_pgo\inffast.obj" - -".\x86-temp-release\pythoncore_pgo\inflate.obj" - -".\x86-temp-release\pythoncore_pgo\inftrees.obj" - -".\x86-temp-release\pythoncore_pgo\trees.obj" - -".\x86-temp-release\pythoncore_pgo\uncompr.obj" - -".\x86-temp-release\pythoncore_pgo\zlibmodule.obj" - -".\x86-temp-release\pythoncore_pgo\zutil.obj" - -".\x86-temp-release\pythoncore_pgo\_bisectmodule.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_cn.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_hk.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_iso2022.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_jp.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_kr.obj" - -".\x86-temp-release\pythoncore_pgo\_codecs_tw.obj" - -".\x86-temp-release\pythoncore_pgo\_codecsmodule.obj" - -".\x86-temp-release\pythoncore_pgo\_csv.obj" - -".\x86-temp-release\pythoncore_pgo\_functoolsmodule.obj" - -".\x86-temp-release\pythoncore_pgo\_heapqmodule.obj" - -".\x86-temp-release\pythoncore_pgo\_hotshot.obj" - -".\x86-temp-release\pythoncore_pgo\_localemodule.obj" - -".\x86-temp-release\pythoncore_pgo\_lsprof.obj" - -".\x86-temp-release\pythoncore_pgo\_randommodule.obj" - -".\x86-temp-release\pythoncore_pgo\_sre.obj" - -".\x86-temp-release\pythoncore_pgo\_struct.obj" - -".\x86-temp-release\pythoncore_pgo\_subprocess.obj" - -".\x86-temp-release\pythoncore_pgo\_weakref.obj" - -".\x86-temp-release\pythoncore_pgo\_winreg.obj" - -".\x86-temp-release\pythoncore_pgo\abstract.obj" - -".\x86-temp-release\pythoncore_pgo\acceler.obj" - -".\x86-temp-release\pythoncore_pgo\arraymodule.obj" - -".\x86-temp-release\pythoncore_pgo\asdl.obj" - -".\x86-temp-release\pythoncore_pgo\ast.obj" - -".\x86-temp-release\pythoncore_pgo\audioop.obj" - -".\x86-temp-release\pythoncore_pgo\binascii.obj" - -".\x86-temp-release\pythoncore_pgo\bitset.obj" - -".\x86-temp-release\pythoncore_pgo\bltinmodule.obj" - -".\x86-temp-release\pythoncore_pgo\boolobject.obj" - -".\x86-temp-release\pythoncore_pgo\bufferobject.obj" - -".\x86-temp-release\pythoncore_pgo\cellobject.obj" - -".\x86-temp-release\pythoncore_pgo\ceval.obj" - -".\x86-temp-release\pythoncore_pgo\classobject.obj" - -".\x86-temp-release\pythoncore_pgo\cmathmodule.obj" - -".\x86-temp-release\pythoncore_pgo\cobject.obj" - -".\x86-temp-release\pythoncore_pgo\codecs.obj" - -".\x86-temp-release\pythoncore_pgo\codeobject.obj" - -".\x86-temp-release\pythoncore_pgo\collectionsmodule.obj" - -".\x86-temp-release\pythoncore_pgo\compile.obj" - -".\x86-temp-release\pythoncore_pgo\complexobject.obj" - -".\x86-temp-release\pythoncore_pgo\config.obj" - -".\x86-temp-release\pythoncore_pgo\cPickle.obj" - -".\x86-temp-release\pythoncore_pgo\cStringIO.obj" - -".\x86-temp-release\pythoncore_pgo\datetimemodule.obj" - -".\x86-temp-release\pythoncore_pgo\descrobject.obj" - -".\x86-temp-release\pythoncore_pgo\dictobject.obj" - -".\x86-temp-release\pythoncore_pgo\dl_nt.obj" - -".\x86-temp-release\pythoncore_pgo\dynload_win.obj" - -".\x86-temp-release\pythoncore_pgo\enumobject.obj" - -".\x86-temp-release\pythoncore_pgo\errnomodule.obj" - -".\x86-temp-release\pythoncore_pgo\errors.obj" - -".\x86-temp-release\pythoncore_pgo\exceptions.obj" - -".\x86-temp-release\pythoncore_pgo\fileobject.obj" - -".\x86-temp-release\pythoncore_pgo\firstsets.obj" - -".\x86-temp-release\pythoncore_pgo\floatobject.obj" - -".\x86-temp-release\pythoncore_pgo\frameobject.obj" - -".\x86-temp-release\pythoncore_pgo\frozen.obj" - -".\x86-temp-release\pythoncore_pgo\funcobject.obj" - -".\x86-temp-release\pythoncore_pgo\future.obj" - -".\x86-temp-release\pythoncore_pgo\gcmodule.obj" - -".\x86-temp-release\pythoncore_pgo\genobject.obj" - -".\x86-temp-release\pythoncore_pgo\getargs.obj" - -".\x86-temp-release\pythoncore_pgo\getcompiler.obj" - -".\x86-temp-release\pythoncore_pgo\getcopyright.obj" - -".\x86-temp-release\pythoncore_pgo\getmtime.obj" - -".\x86-temp-release\pythoncore_pgo\getopt.obj" - -".\x86-temp-release\pythoncore_pgo\getpathp.obj" - -".\x86-temp-release\pythoncore_pgo\getplatform.obj" - -".\x86-temp-release\pythoncore_pgo\getversion.obj" - -".\x86-temp-release\pythoncore_pgo\graminit.obj" - -".\x86-temp-release\pythoncore_pgo\grammar.obj" - -".\x86-temp-release\pythoncore_pgo\grammar1.obj" - -".\x86-temp-release\pythoncore_pgo\imageop.obj" - -".\x86-temp-release\pythoncore_pgo\import.obj" - -".\x86-temp-release\pythoncore_pgo\import_nt.obj" - -".\x86-temp-release\pythoncore_pgo\importdl.obj" - -".\x86-temp-release\pythoncore_pgo\intobject.obj" - -".\x86-temp-release\pythoncore_pgo\iterobject.obj" - -".\x86-temp-release\pythoncore_pgo\itertoolsmodule.obj" - -".\x86-temp-release\pythoncore_pgo\listnode.obj" - -".\x86-temp-release\pythoncore_pgo\listobject.obj" - -".\x86-temp-release\pythoncore_pgo\longobject.obj" - -".\x86-temp-release\pythoncore_pgo\main.obj" - -".\x86-temp-release\pythoncore_pgo\marshal.obj" - -".\x86-temp-release\pythoncore_pgo\mathmodule.obj" - -".\x86-temp-release\pythoncore_pgo\md5.obj" - -".\x86-temp-release\pythoncore_pgo\md5module.obj" - -".\x86-temp-release\pythoncore_pgo\metagrammar.obj" - -".\x86-temp-release\pythoncore_pgo\methodobject.obj" - -".\x86-temp-release\pythoncore_pgo\mmapmodule.obj" - -".\x86-temp-release\pythoncore_pgo\modsupport.obj" - -".\x86-temp-release\pythoncore_pgo\moduleobject.obj" - -".\x86-temp-release\pythoncore_pgo\msvcrtmodule.obj" - -".\x86-temp-release\pythoncore_pgo\multibytecodec.obj" - -".\x86-temp-release\pythoncore_pgo\myreadline.obj" - -".\x86-temp-release\pythoncore_pgo\mysnprintf.obj" - -".\x86-temp-release\pythoncore_pgo\mystrtoul.obj" - -".\x86-temp-release\pythoncore_pgo\node.obj" - -".\x86-temp-release\pythoncore_pgo\object.obj" - -".\x86-temp-release\pythoncore_pgo\obmalloc.obj" - -".\x86-temp-release\pythoncore_pgo\operator.obj" - -".\x86-temp-release\pythoncore_pgo\parser.obj" - -".\x86-temp-release\pythoncore_pgo\parsermodule.obj" - -".\x86-temp-release\pythoncore_pgo\parsetok.obj" - -".\x86-temp-release\pythoncore_pgo\posixmodule.obj" - -".\x86-temp-release\pythoncore_pgo\pyarena.obj" - -".\x86-temp-release\pythoncore_pgo\pyfpe.obj" - -".\x86-temp-release\pythoncore_pgo\pystate.obj" - -".\x86-temp-release\pythoncore_pgo\pystrtod.obj" - -".\x86-temp-release\pythoncore_pgo\Python-ast.obj" - -".\x86-temp-release\pythoncore_pgo\python_nt.res" - -".\x86-temp-release\pythoncore_pgo\pythonrun.obj" - -".\x86-temp-release\pythoncore_pgo\rangeobject.obj" - -".\x86-temp-release\pythoncore_pgo\rgbimgmodule.obj" - -".\x86-temp-release\pythoncore_pgo\rotatingtree.obj" - -".\x86-temp-release\pythoncore_pgo\setobject.obj" - -".\x86-temp-release\pythoncore_pgo\sha256module.obj" - -".\x86-temp-release\pythoncore_pgo\sha512module.obj" - -".\x86-temp-release\pythoncore_pgo\shamodule.obj" - -".\x86-temp-release\pythoncore_pgo\signalmodule.obj" - -".\x86-temp-release\pythoncore_pgo\sliceobject.obj" - -".\x86-temp-release\pythoncore_pgo\stringobject.obj" - -".\x86-temp-release\pythoncore_pgo\stropmodule.obj" - -".\x86-temp-release\pythoncore_pgo\structmember.obj" - -".\x86-temp-release\pythoncore_pgo\structseq.obj" - -".\x86-temp-release\pythoncore_pgo\symtable.obj" - -".\x86-temp-release\pythoncore_pgo\symtablemodule.obj" - -".\x86-temp-release\pythoncore_pgo\sysmodule.obj" - -".\x86-temp-release\pythoncore_pgo\thread.obj" - -".\x86-temp-release\pythoncore_pgo\threadmodule.obj" - -".\x86-temp-release\pythoncore_pgo\timemodule.obj" - -".\x86-temp-release\pythoncore_pgo\tokenizer.obj" - -".\x86-temp-release\pythoncore_pgo\traceback.obj" - -".\x86-temp-release\pythoncore_pgo\tupleobject.obj" - -".\x86-temp-release\pythoncore_pgo\typeobject.obj" - -".\x86-temp-release\pythoncore_pgo\unicodectype.obj" - -".\x86-temp-release\pythoncore_pgo\unicodeobject.obj" - -".\x86-temp-release\pythoncore_pgo\weakrefobject.obj" - -".\x86-temp-release\pythoncore_pgo\xxsubtype.obj" - -".\x86-temp-release\pythoncore_pgo\yuvconvert.obj" - -".\x86-temp-release\pythoncore_pgo\zipimport.obj" diff --git a/PCbuild8/pythonw.vcproj b/PCbuild8/pythonw.vcproj index 4271673..f692363 100644 --- a/PCbuild8/pythonw.vcproj +++ b/PCbuild8/pythonw.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="pythonw" ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" + RootNamespace="pythonw" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\pythonw" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -62,11 +66,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./pythonw_d.exe" + OutputFile="$(OutDir)\pythonw_d.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./pythonw_d.pdb" + ProgramDatabaseFile="" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -98,9 +103,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\pythonw" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -120,16 +125,14 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" @@ -141,7 +144,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -149,15 +152,16 @@ /> <Tool Name="VCLinkerTool" - OutputFile=".\./pythonw.exe" + OutputFile="$(OutDir)\pythonw_d.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./pythonw.pdb" + ProgramDatabaseFile="" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -185,9 +189,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\pythonw" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -210,20 +214,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -240,16 +240,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile=".\./pythonw.exe" + OutputFile="$(OutDir)\pythonw.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./pythonw.pdb" + ProgramDatabaseFile="" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -277,9 +277,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\pythonw" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -299,23 +299,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -332,16 +329,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile=".\./pythonw.exe" + OutputFile="$(OutDir)\pythonw.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./pythonw.pdb" + ProgramDatabaseFile="" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/readme.txt b/PCbuild8/readme.txt index e521fee..fa4fcb5 100644 --- a/PCbuild8/readme.txt +++ b/PCbuild8/readme.txt @@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python25.{dll, lib} in Release mode) + python26.{dll, lib} in Release mode) NOTE: in previous releases, this subproject was named after the release number, e.g. python20. @@ -25,8 +25,21 @@ The proper order to build subprojects: to the subsystems they implement, or are running a Python core buildbot test slave; see SUBPROJECTS below) +Binary files go into PCBuild8\Win32 or \x64 directories and don't +interfere with each other. + When using the Debug setting, the output files have a _d added to -their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on. +their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on. + +There are two special configurations for the pythoncore project and +the solution. These are PGIRelease and PGORelease. They are for +createing profile-guided optimized versions of python.dll. +The former creates the instrumented binaries, and the latter +runs python.exe with the instrumented python.dll on the performance +testsuite, and creates a new, optimized, python.dll in +PCBuild8\Win32\PGORelease, or in the x64 folder. Note that although +we can cross-compile x64 binaries on a 32 bit machine, we cannot +create the PGO binaries, since they require actually running the code. SUBPROJECTS ----------- @@ -37,12 +50,6 @@ supporting that module unless they import the module. pythoncore .dll and .lib -pythoncore_pgo - .dll and .lib, a variant of pythoncore that is optimized through a - Profile Guided Optimization (PGO), employing pybench as the profile - case to optimize for. The results are produced as a python25.{dll,lib} - in the subfolder 'pythoncore_pgo'. To use this instead of the - standard Python dll place this dll with the python.exe. python .exe pythonw diff --git a/PCbuild8/select.vcproj b/PCbuild8/select.vcproj index 97a554b..72888cb 100644 --- a/PCbuild8/select.vcproj +++ b/PCbuild8/select.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="select" ProjectGUID="{97239A56-DBC0-41D2-BC14-C87D9B97D63B}" + RootNamespace="select" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\select" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -64,15 +68,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" + OutputFile="$(OutDir)\select.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./select.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -101,9 +106,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\select" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -123,13 +128,17 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" - RuntimeLibrary="3" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" @@ -148,16 +157,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="./select_d.pyd" + OutputFile="$(OutDir)\select.pyd" LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libc,msvcrt" + AdditionalLibraryDirectories="$(OutDir)" + IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./select_d.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select_d.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -185,9 +195,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\select" + Name="Debug|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -210,20 +220,13 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -238,18 +241,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" + OutputFile="$(OutDir)\select_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libc" + AdditionalLibraryDirectories="$(OutDir)" + IgnoreDefaultLibraryNames="libc,msvcrt" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./select.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -277,9 +280,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\select" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -299,23 +302,17 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -330,18 +327,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="wsock32.lib" - OutputFile="./select.pyd" + OutputFile="$(OutDir)\select_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="libc" + AdditionalLibraryDirectories="$(OutDir)" + IgnoreDefaultLibraryNames="libc,msvcrt" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./select.pdb" + ProgramDatabaseFile="" SubSystem="2" BaseAddress="0x1D110000" - ImportLibrary=".\./select.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/unicodedata.vcproj b/PCbuild8/unicodedata.vcproj index d6c375b..75d7483 100644 --- a/PCbuild8/unicodedata.vcproj +++ b/PCbuild8/unicodedata.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="unicodedata" ProjectGUID="{FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}" + RootNamespace="unicodedata" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\unicodedata" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -63,12 +67,14 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./unicodedata.pyd" + OutputFile="$(OutDir)\unicodedata.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./unicodedata.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -97,9 +103,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\unicodedata" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -120,18 +126,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -145,14 +153,15 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./unicodedata_d.pyd" + OutputFile="$(OutDir)\unicodedata.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./unicodedata_d.pdb" + ProgramDatabaseFile="" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata_d.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -180,9 +189,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\unicodedata" + Name="Debug|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -206,20 +215,14 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -234,14 +237,15 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" - OutputFile="./unicodedata.pyd" + OutputFile="$(OutDir)\unicodedata_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./unicodedata.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -269,9 +273,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\unicodedata" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -292,23 +296,18 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" - StringPooling="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" CompileAs="0" /> @@ -323,14 +322,15 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" - OutputFile="./unicodedata.pyd" + OutputFile="$(OutDir)\unicodedata_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./unicodedata.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D120000" - ImportLibrary=".\./unicodedata.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild8/w9xpopen.vcproj b/PCbuild8/w9xpopen.vcproj index 3539ecc..c159750 100644 --- a/PCbuild8/w9xpopen.vcproj +++ b/PCbuild8/w9xpopen.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="w9xpopen" ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" + RootNamespace="w9xpopen" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\w9xpopen" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -60,11 +64,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./w9xpopen_d.exe" + OutputFile="$(OutDir)\w9xpopen_d.exe" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./w9xpopen_d.pdb" + ProgramDatabaseFile="" TargetMachine="1" /> <Tool @@ -93,9 +98,89 @@ /> </Configuration> <Configuration + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\w9xpopen_d.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\w9xpopen" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -140,10 +225,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile=".\./w9xpopen.exe" + OutputFile="$(OutDir)\w9xpopen.exe" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./w9xpopen.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" TargetMachine="1" /> <Tool @@ -171,6 +258,87 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\w9xpopen.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/PCbuild8/winsound.vcproj b/PCbuild8/winsound.vcproj index 6a84ebb..6ccb43b 100644 --- a/PCbuild8/winsound.vcproj +++ b/PCbuild8/winsound.vcproj @@ -4,19 +4,23 @@ Version="8,00" Name="winsound" ProjectGUID="{51F35FAE-FB92-4B2C-9187-1542C065AD77}" + RootNamespace="winsound" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\winsound" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -63,13 +67,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib" - OutputFile="./winsound_d.pyd" + OutputFile="$(OutDir)\winsound_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./winsound_d.pdb" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./winsound_d.lib" + ImportLibrary="" TargetMachine="1" /> <Tool @@ -98,9 +103,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\winsound" + Name="Debug|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -121,19 +126,19 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -148,13 +153,15 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" + OutputFile="$(OutDir)\winsound_d.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./winsound.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="1" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -182,9 +189,9 @@ /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\winsound" + Name="Release|Win32" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -208,21 +215,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -236,15 +238,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" + OutputFile="$(OutDir)\winsound.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./winsound.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -272,9 +275,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\winsound" + Name="Release|x64" + OutputDirectory="$(PlatformName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" @@ -295,24 +298,20 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Include,..\PC" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" StringPooling="true" - BasicRuntimeChecks="0" RuntimeLibrary="2" - BufferSecurityCheck="false" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" CompileAs="0" /> <Tool @@ -326,15 +325,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="winmm.lib" - OutputFile="./winsound.pyd" + OutputFile="$(OutDir)\winsound.pyd" LinkIncremental="1" SuppressStartupBanner="true" - ProgramDatabaseFile=".\./winsound.pdb" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="" BaseAddress="0x1D160000" - ImportLibrary=".\./winsound.lib" - TargetMachine="0" + ImportLibrary="" + TargetMachine="17" /> <Tool Name="VCALinkTool" |