diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-19 01:23:57 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-19 01:23:57 (GMT) |
| commit | 8a48c4c915ce6b2889f0d2926389f49ed22be987 (patch) | |
| tree | 6c5733d3288ca375b307e4c51eea38b1f3b5214b /PCbuild9 | |
| parent | 80101a8ac7a8291c3341ca3373b1d0ddd2892de9 (diff) | |
| download | cpython-8a48c4c915ce6b2889f0d2926389f49ed22be987.zip cpython-8a48c4c915ce6b2889f0d2926389f49ed22be987.tar.gz cpython-8a48c4c915ce6b2889f0d2926389f49ed22be987.tar.bz2 | |
Removed ReleaseAMD64 and replaced it with platform x64. The x64 builds fine except of the modules that depend on external libraries like tkinter and openssl. And I can't test the build on my 32bit CPU.
Diffstat (limited to 'PCbuild9')
| -rw-r--r-- | PCbuild9/_bsddb.vcproj | 77 | ||||
| -rw-r--r-- | PCbuild9/_ctypes.vcproj | 104 | ||||
| -rw-r--r-- | PCbuild9/_ctypes_test.vcproj | 74 | ||||
| -rw-r--r-- | PCbuild9/_elementtree.vcproj | 77 | ||||
| -rw-r--r-- | PCbuild9/_msi.vcproj | 82 | ||||
| -rw-r--r-- | PCbuild9/_socket.vcproj | 76 | ||||
| -rw-r--r-- | PCbuild9/_sqlite3.vcproj | 79 | ||||
| -rw-r--r-- | PCbuild9/_ssl.vcproj | 77 | ||||
| -rw-r--r-- | PCbuild9/_testcapi.vcproj | 75 | ||||
| -rw-r--r-- | PCbuild9/_tkinter.vcproj | 76 | ||||
| -rw-r--r-- | PCbuild9/bz2.vcproj | 76 | ||||
| -rw-r--r-- | PCbuild9/make_buildinfo.vcproj | 153 | ||||
| -rw-r--r-- | PCbuild9/make_versioninfo.vcproj | 169 | ||||
| -rw-r--r-- | PCbuild9/pcbuild.sln | 129 | ||||
| -rw-r--r-- | PCbuild9/pyexpat.vcproj | 75 | ||||
| -rw-r--r-- | PCbuild9/pyproject.vsprops | 3 | ||||
| -rw-r--r-- | PCbuild9/python.vcproj | 95 | ||||
| -rw-r--r-- | PCbuild9/pythoncore.vcproj | 106 | ||||
| -rw-r--r-- | PCbuild9/pythonw.vcproj | 95 | ||||
| -rw-r--r-- | PCbuild9/select.vcproj | 77 | ||||
| -rw-r--r-- | PCbuild9/unicodedata.vcproj | 75 | ||||
| -rw-r--r-- | PCbuild9/w9xpopen.vcproj | 90 | ||||
| -rw-r--r-- | PCbuild9/winsound.vcproj | 86 | ||||
| -rw-r--r-- | PCbuild9/x64.vsprops (renamed from PCbuild9/amd64.vsprops) | 8 |
24 files changed, 1848 insertions, 186 deletions
diff --git a/PCbuild9/_bsddb.vcproj b/PCbuild9/_bsddb.vcproj index 814ca9b..eea3eed 100644 --- a/PCbuild9/_bsddb.vcproj +++ b/PCbuild9/_bsddb.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bsddbDir)" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1e180000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -155,11 +225,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -177,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_ctypes.vcproj b/PCbuild9/_ctypes.vcproj index cbadfa8..f532840 100644 --- a/PCbuild9/_ctypes.vcproj +++ b/PCbuild9/_ctypes.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + BaseAddress="0x1D1A0000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -153,11 +223,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -175,6 +243,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -196,8 +265,8 @@ /> <Tool Name="VCLinkerTool" - LinkIncremental="1" - SubSystem="2" + AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" OptimizeReferences="2" EnableCOMDATFolding="2" BaseAddress="0x1D1A0000" @@ -295,7 +364,15 @@ RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c" > <FileConfiguration - Name="ReleaseAMD64|Win32" + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" ExcludedFromBuild="true" > <Tool @@ -315,6 +392,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" > @@ -323,11 +408,12 @@ /> </FileConfiguration> <FileConfiguration - Name="ReleaseAMD64|Win32" + Name="Release|x64" > <Tool Name="VCCustomBuildTool" - CommandLine="amd64_ml64 /nologo /c /Fo "$(IntDir)\win64.obj"
" + CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"" + Outputs="$(IntDir)\win64.obj" /> </FileConfiguration> </File> diff --git a/PCbuild9/_ctypes_test.vcproj b/PCbuild9/_ctypes_test.vcproj index 991e2bf..7c9f2ef 100644 --- a/PCbuild9/_ctypes_test.vcproj +++ b/PCbuild9/_ctypes_test.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -80,6 +83,70 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -149,11 +216,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -171,6 +236,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_elementtree.vcproj b/PCbuild9/_elementtree.vcproj index 6077cd8..b7841ba 100644 --- a/PCbuild9/_elementtree.vcproj +++ b/PCbuild9/_elementtree.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\Modules\expat" + PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1D100000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -155,11 +225,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -177,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_msi.vcproj b/PCbuild9/_msi.vcproj index edb5937..31cd83b 100644 --- a/PCbuild9/_msi.vcproj +++ b/PCbuild9/_msi.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -53,7 +56,73 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1D160000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" @@ -122,7 +191,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -153,11 +222,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -175,6 +242,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -195,7 +263,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" diff --git a/PCbuild9/_socket.vcproj b/PCbuild9/_socket.vcproj index acbcc75..95d3dea 100644 --- a/PCbuild9/_socket.vcproj +++ b/PCbuild9/_socket.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -82,6 +85,72 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1e1D0000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -153,11 +222,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -175,6 +242,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_sqlite3.vcproj b/PCbuild9/_sqlite3.vcproj index 049a057..2ae9cb1 100644 --- a/PCbuild9/_sqlite3.vcproj +++ b/PCbuild9/_sqlite3.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(sqlite3Dir)" + PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1e180000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -155,11 +225,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -177,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -198,7 +267,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\amd64\sqlite3.lib" + AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" diff --git a/PCbuild9/_ssl.vcproj b/PCbuild9/_ssl.vcproj index 93889ae..64b95da 100644 --- a/PCbuild9/_ssl.vcproj +++ b/PCbuild9/_ssl.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(opensslDir)\inc32" + PreprocessorDefinitions="_SOCKET_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="python_d.exe build_ssl.py $(ConfigurationName) -a" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -155,11 +225,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -177,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_testcapi.vcproj b/PCbuild9/_testcapi.vcproj index 1047bba..7a12ae6 100644 --- a/PCbuild9/_testcapi.vcproj +++ b/PCbuild9/_testcapi.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -81,6 +84,71 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="MMAP_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1e1F0000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -151,11 +219,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -173,6 +239,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/_tkinter.vcproj b/PCbuild9/_tkinter.vcproj index bce2939..6a86dab 100644 --- a/PCbuild9/_tkinter.vcproj +++ b/PCbuild9/_tkinter.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -82,6 +85,72 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(tcltkDir)\include" + PreprocessorDefinitions="_TKINTER_EXPORTS;WITH_APPINIT" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -153,11 +222,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -175,6 +242,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/bz2.vcproj b/PCbuild9/bz2.vcproj index 5b72573..6ca85e3 100644 --- a/PCbuild9/bz2.vcproj +++ b/PCbuild9/bz2.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -82,6 +85,72 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(bz2Dir)" + PreprocessorDefinitions="BZ2_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -153,11 +222,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -175,6 +242,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/make_buildinfo.vcproj b/PCbuild9/make_buildinfo.vcproj index 9272ae7..448c49b 100644 --- a/PCbuild9/make_buildinfo.vcproj +++ b/PCbuild9/make_buildinfo.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -60,8 +63,81 @@ OutputFile="$(OutDir)/make_buildinfo.exe" LinkIncremental="2" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/make_buildinfo.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/make_buildinfo.exe" + LinkIncremental="2" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -128,9 +204,84 @@ OutputFile="$(OutDir)/make_buildinfo.exe" LinkIncremental="1" GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/make_buildinfo.exe" + LinkIncremental="1" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj index da29ef6..b34d4d3 100644 --- a/PCbuild9/make_versioninfo.vcproj +++ b/PCbuild9/make_versioninfo.vcproj @@ -11,6 +11,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -66,9 +69,91 @@ AdditionalDependencies="odbccp32.lib" OutputFile=".\./make_versioninfo.exe" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./make_versioninfo.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(TargetFileName) > ..\PC\python_nt.h" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine=".\make_versioninfo.exe >..\PC\pythonnt_rc.h
" + Outputs="..\PC\pythonnt_rc.h" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile=".\./make_versioninfo.exe" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" BaseAddress="0x1d000000" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -142,9 +227,89 @@ AdditionalDependencies="odbccp32.lib" OutputFile="./make_versioninfo_d.exe" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./make_versioninfo_d.pdb" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(TargetFileName) > ..\PC\python_nt_d.h" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine=".\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h
" + Outputs="..\PC\pythonnt_rc_d.h" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + BrowseInformation="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="./make_versioninfo_d.exe" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" BaseAddress="0x1d000000" + TargetMachine="17" /> <Tool Name="VCALinkTool" diff --git a/PCbuild9/pcbuild.sln b/PCbuild9/pcbuild.sln index 82f0fa0..d20dd64 100644 --- a/PCbuild9/pcbuild.sln +++ b/PCbuild9/pcbuild.sln @@ -109,136 +109,179 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 - ReleaseAMD64|Win32 = ReleaseAMD64|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {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}.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}.Release|x64.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 {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}.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}.Release|x64.ActiveCfg = Release|x64 + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 {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}.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}.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}.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}.Release|x64.ActiveCfg = Release|x64 + {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.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}.Release|Win32.ActiveCfg = Release|Win32 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64 + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.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}.Debug|x64.ActiveCfg = Debug|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.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}.Release|x64.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64 {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.ActiveCfg = Debug|Win32 {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.Build.0 = Debug|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.ActiveCfg = Debug|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.Build.0 = Debug|x64 {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.ActiveCfg = Release|Win32 {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.Build.0 = Release|Win32 - {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.ActiveCfg = Release|x64 + {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.Build.0 = Release|x64 {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32 {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64 {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32 {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32 - {0E9791DB-593A-465F-98BC-681011311618}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {0E9791DB-593A-465F-98BC-681011311618}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64 + {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64 {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32 {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64 {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32 {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32 - {9EC7190A-249F-4180-A900-548FDCF3055F}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {9EC7190A-249F-4180-A900-548FDCF3055F}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64 + {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64 {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32 {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64 {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32 {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32 - {17E1E049-C309-4D79-843F-AE483C264AEA}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {17E1E049-C309-4D79-843F-AE483C264AEA}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64 + {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64 {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32 {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64 {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32 {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32 - {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64 + {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64 {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32 {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64 {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32 {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32 - {86937F53-C189-40EF-8CE8-8759D8E7D480}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {86937F53-C189-40EF-8CE8-8759D8E7D480}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64 + {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64 {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.ActiveCfg = Debug|Win32 {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.Build.0 = Debug|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.ActiveCfg = Debug|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.Build.0 = Debug|x64 {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.ActiveCfg = Release|Win32 {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.Build.0 = Release|Win32 - {13CECB97-4119-4316-9D42-8534019A5A44}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {13CECB97-4119-4316-9D42-8534019A5A44}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.ActiveCfg = Release|x64 + {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.Build.0 = Release|x64 {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32 {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64 {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32 {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32 - {C6E20F84-3247-4AD6-B051-B073268F73BA}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {C6E20F84-3247-4AD6-B051-B073268F73BA}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64 + {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64 {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32 {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64 {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32 {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32 - {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64 + {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64 {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.ActiveCfg = Debug|Win32 {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.Build.0 = Debug|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.ActiveCfg = Debug|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.Build.0 = Debug|x64 {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.ActiveCfg = Release|Win32 {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.Build.0 = Release|Win32 - {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.ActiveCfg = Release|x64 + {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.Build.0 = Release|x64 {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.ActiveCfg = Debug|Win32 {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.Build.0 = Debug|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.ActiveCfg = Debug|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.Build.0 = Debug|x64 {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.ActiveCfg = Release|Win32 {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.Build.0 = Release|Win32 - {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.ActiveCfg = Release|x64 + {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.Build.0 = Release|x64 {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32 {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64 {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32 {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32 - {18CAE28C-B454-46C1-87A0-493D91D97F03}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {18CAE28C-B454-46C1-87A0-493D91D97F03}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64 + {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64 {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32 {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64 {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32 {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32 - {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64 + {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32 - {D06B6426-4762-44CC-8BAD-D79052507F2F}.ReleaseAMD64|Win32.ActiveCfg = ReleaseAMD64|Win32 - {D06B6426-4762-44CC-8BAD-D79052507F2F}.ReleaseAMD64|Win32.Build.0 = ReleaseAMD64|Win32 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PCbuild9/pyexpat.vcproj b/PCbuild9/pyexpat.vcproj index 02988fe..788a9ee 100644 --- a/PCbuild9/pyexpat.vcproj +++ b/PCbuild9/pyexpat.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -81,6 +84,71 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".\..\Modules\expat" + PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -151,11 +219,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -173,6 +239,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/pyproject.vsprops b/PCbuild9/pyproject.vsprops index 7577987..1f3ff08 100644 --- a/PCbuild9/pyproject.vsprops +++ b/PCbuild9/pyproject.vsprops @@ -4,7 +4,7 @@ Version="8.00" Name="pyproject" OutputDirectory="$(SolutionDir)" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\" > <Tool Name="VCCLCompilerTool" @@ -25,6 +25,7 @@ LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" SubSystem="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj index 46b8f56..ba36272 100644 --- a/PCbuild9/python.vcproj +++ b/PCbuild9/python.vcproj @@ -10,6 +10,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -63,8 +66,6 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - ProgramDatabaseFile=".\./python.pdb" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -92,11 +93,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -115,6 +114,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -142,8 +142,6 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - ProgramDatabaseFile=".\./python.pdb" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -218,8 +216,81 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./python_d.exe" - ProgramDatabaseFile=".\./python_d.pdb" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.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" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + BrowseInformation="1" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -251,10 +322,6 @@ </References> <Files> <Filter - Name="Header Files" - > - </Filter> - <Filter Name="Resource Files" > <File diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj index 8431f31..87cab01 100644 --- a/PCbuild9/pythoncore.vcproj +++ b/PCbuild9/pythoncore.vcproj @@ -11,6 +11,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -62,11 +65,11 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" + OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" - ProgramDatabaseFile="python30.pdb" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" - ImportLibrary="python30.lib" + ImportLibrary="$(OutDir)$(PyDllName).lib" /> <Tool Name="VCALinkTool" @@ -91,11 +94,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyproject.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -113,6 +114,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -139,11 +141,11 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" + OutputFile="$(OutDir)\$(PyDllName).dll" IgnoreDefaultLibraryNames="libc" - ProgramDatabaseFile="python30.pdb" + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" - ImportLibrary="python30.lib" + ImportLibrary="$(OutDir)$(PyDllName).lib" /> <Tool Name="VCALinkTool" @@ -216,11 +218,89 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="$(PyDllName)_d.dll" + OutputFile="$(OutDir)\$(PyDllName)_d.dll" + IgnoreDefaultLibraryNames="libc" + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/Zm200 " + Optimization="0" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="..\Python;..\Modules\zlib" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + Description="generate buildinfo" + CommandLine="make_buildinfo.exe $(ConfigurationName)" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="getbuildinfo.o" + OutputFile="$(OutDir)\$(PyDllName)_d.dll" IgnoreDefaultLibraryNames="libc" - ProgramDatabaseFile="python30_d.pdb" + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" BaseAddress="0x1e000000" - ImportLibrary="$(PyDllName)_d.lib" + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" /> <Tool Name="VCALinkTool" diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj index 05d8c32..6b9ec8e 100644 --- a/PCbuild9/pythonw.vcproj +++ b/PCbuild9/pythonw.vcproj @@ -10,6 +10,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -58,8 +61,6 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./pythonw_d.exe" - ProgramDatabaseFile=".\./pythonw_d.pdb" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -88,9 +89,80 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" + Name="Debug|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + SubSystem="2" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -134,11 +206,10 @@ /> <Tool Name="VCLinkerTool" - OutputFile=".\./pythonw.exe" - ProgramDatabaseFile=".\./pythonw.pdb" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -163,9 +234,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -183,6 +254,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -209,12 +281,9 @@ /> <Tool Name="VCLinkerTool" - OutputFile=".\./pythonw.exe" - ProgramDatabaseFile=".\./pythonw.pdb" SubSystem="2" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -243,10 +312,6 @@ </References> <Files> <Filter - Name="Header Files" - > - </Filter> - <Filter Name="Resource Files" > <File diff --git a/PCbuild9/select.vcproj b/PCbuild9/select.vcproj index 01d23da..9985620 100644 --- a/PCbuild9/select.vcproj +++ b/PCbuild9/select.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -83,6 +86,73 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="wsock32.lib" + LinkIncremental="2" + IgnoreDefaultLibraryNames="libc" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1D110000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -155,11 +225,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -177,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/unicodedata.vcproj b/PCbuild9/unicodedata.vcproj index 6a16b56..43c0bbd 100644 --- a/PCbuild9/unicodedata.vcproj +++ b/PCbuild9/unicodedata.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -81,6 +84,71 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="MMAP_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + BaseAddress="0x1D120000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -151,11 +219,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -173,6 +239,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj index 6b25a8f..23f1056 100644 --- a/PCbuild9/w9xpopen.vcproj +++ b/PCbuild9/w9xpopen.vcproj @@ -4,12 +4,16 @@ Version="9,00" Name="w9xpopen" ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" + RootNamespace="w9xpopen" TargetFrameworkVersion="131072" > <Platforms> <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -57,9 +61,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="./w9xpopen_d.exe" GenerateDebugInformation="true" - ProgramDatabaseFile=".\./w9xpopen_d.pdb" SubSystem="1" /> <Tool @@ -85,11 +87,78 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.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="1" + UsePrecompiledHeader="0" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + SubSystem="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyproject.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -130,8 +199,6 @@ /> <Tool Name="VCLinkerTool" - OutputFile="w9xpopen.exe" - ProgramDatabaseFile="w9xpopen.pdb" SubSystem="1" /> <Tool @@ -157,9 +224,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Release|x64" ConfigurationType="1" - InheritedPropertySheets=".\pyproject.vsprops" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -178,6 +245,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -200,8 +268,6 @@ /> <Tool Name="VCLinkerTool" - OutputFile="w9xpopen.exe" - ProgramDatabaseFile="w9xpopen.pdb" SubSystem="1" /> <Tool diff --git a/PCbuild9/winsound.vcproj b/PCbuild9/winsound.vcproj index a0f4066..a03d3d4 100644 --- a/PCbuild9/winsound.vcproj +++ b/PCbuild9/winsound.vcproj @@ -12,6 +12,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -80,6 +83,70 @@ /> </Configuration> <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" ConfigurationType="2" InheritedPropertySheets=".\pyd.vsprops" @@ -150,11 +217,9 @@ /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -172,6 +237,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -235,18 +301,6 @@ > </File> </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - </Filter> </Files> <Globals> </Globals> diff --git a/PCbuild9/amd64.vsprops b/PCbuild9/x64.vsprops index 0803dbf..acc3325 100644 --- a/PCbuild9/amd64.vsprops +++ b/PCbuild9/x64.vsprops @@ -3,15 +3,15 @@ ProjectType="Visual C++" Version="8.00" Name="amd64" - OutputDirectory="$(SolutionDir)/amd64" + OutputDirectory="$(SolutionDir)\amd64\" + IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\" > <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON /GS-" + AdditionalOptions="/USECL:MS_OPTERON /GS-" /> <Tool Name="VCLinkerTool" - TargetMachine="0" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" + TargetMachine="17" /> </VisualStudioPropertySheet> |