]> granicus.if.org Git - python/commitdiff
Backport the .sln and .vcproj files for PCBuild8 from the python trunk to the 2.5...
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Sat, 7 Oct 2006 14:56:30 +0000 (14:56 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Sat, 7 Oct 2006 14:56:30 +0000 (14:56 +0000)
17 files changed:
Modules/_struct.c
PCbuild8/_ctypes.vcproj
PCbuild8/_ctypes_test.vcproj
PCbuild8/_elementtree.vcproj
PCbuild8/_msi.vcproj
PCbuild8/_sqlite3.vcproj
PCbuild8/make_buildinfo.c
PCbuild8/make_buildinfo.vcproj
PCbuild8/pcbuild.sln
PCbuild8/python.vcproj
PCbuild8/pythoncore.vcproj
PCbuild8/pythonw.vcproj
PCbuild8/readme.txt
PCbuild8/select.vcproj
PCbuild8/unicodedata.vcproj
PCbuild8/w9xpopen.vcproj
PCbuild8/winsound.vcproj

index 22d0e030cfcfe828847d3af2dff86dd37b5c5f51..fb509872a7e60a3b56e0bf48245891d956256558 100644 (file)
@@ -820,7 +820,7 @@ bu_longlong(const char *p, const formatdef *f)
        } while (--i > 0);
        /* Extend the sign bit. */
        if (SIZEOF_LONG_LONG > f->size)
-               x |= -(x & (1L << ((8 * f->size) - 1)));
+               x |= -(x & ( (PY_LONG_LONG)1 << ((8 * f->size) - 1)));
        if (x >= LONG_MIN && x <= LONG_MAX)
                return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
        return PyLong_FromLongLong(x);
@@ -1038,7 +1038,7 @@ lu_longlong(const char *p, const formatdef *f)
        } while (i > 0);
        /* Extend the sign bit. */
        if (SIZEOF_LONG_LONG > f->size)
-               x |= -(x & (1L << ((8 * f->size) - 1)));
+               x |= -(x & ( (PY_LONG_LONG)1 << ((8 * f->size) - 1)));
        if (x >= LONG_MIN && x <= LONG_MAX)
                return PyInt_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
        return PyLong_FromLongLong(x);
index b09f5c2b373b28a8f05c8f9c87d54686459baa5c..644996bdfde169d2beb34409382f7bba3b260855 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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
                        <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"
                        />
                </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"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON"
-                               InlineFunctionExpansion="1"
+                               WholeProgramOptimization="true"
                                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
                        />
                        <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"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1D1A0000"
-                               ImportLibrary=".\./_ctypes.lib"
-                               TargetMachine="0"
+                               ImportLibrary=""
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </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"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               InlineFunctionExpansion="1"
+                               WholeProgramOptimization="true"
                                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
                        />
                        <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"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1D1A0000"
-                               ImportLibrary=".\./_ctypes.lib"
-                               TargetMachine="0"
+                               ImportLibrary=""
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
index e4503ea0be829afd4214edc50323495b9d2b5d0d..f25290196837b5b5603943041da3d05ce9562b54 100644 (file)
@@ -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"
                        />
                        <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
                        />
                </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"
                        />
                        <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
                        />
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"
index a496f7a1a27ce69ad8bbaf7bdae7d32c1712c332..6b79ac8dbd07af00eb67b5940802e0ba54b1cf2c 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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"
                        <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"
                        />
                </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"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
                                Optimization="2"
-                               InlineFunctionExpansion="1"
+                               WholeProgramOptimization="true"
                                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"
                        />
                        />
                        <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"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1D100000"
-                               ImportLibrary=".\./_elementtree.lib"
-                               TargetMachine="0"
+                               ImportLibrary=""
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </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"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
                                Optimization="2"
-                               InlineFunctionExpansion="1"
+                               WholeProgramOptimization="true"
                                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"
                        />
                        />
                        <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"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1D100000"
-                               ImportLibrary=".\./_elementtree.lib"
-                               TargetMachine="0"
+                               ImportLibrary=""
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
index 125db7d1900a3fb4576bae6f61e488bf6a5518e0..ac9e0796c57f1dc8d8ab19bc70f86d2e35b0a2e4 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"
index cd26b8b191ad6d8f4a300c22e06a1766f061f2c7..3ede48f7afee0da34fef25f556a8f9053d2c55d6 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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=\&quot;sqlite3\&quot;"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        <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"
                        />
                </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"
                        />
                        <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=\&quot;sqlite3\&quot;"
                                StringPooling="true"
-                               BasicRuntimeChecks="0"
                                RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        />
                        <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"
                        />
                </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"
                        />
                        <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=\&quot;sqlite3\&quot;"
                                StringPooling="true"
-                               BasicRuntimeChecks="0"
                                RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        />
                        <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"
index 4cebf45ccd8455debc898c55a2ed5ac85a657e89..85416ed39d15243741098059882476e45046b9da 100644 (file)
@@ -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
index 5dc6bca570a34b7633ad6285eec92a1c126e043c..58ed000fe5e49f8a43b0a3123d5fc05d11382dfd 100644 (file)
@@ -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"
                        />
                        <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>
index 9f4762687310abf0dafd4b66f3d8f7d288c519ba..35d65a066459ae02d5ff0bb573c6499efdf36724 100644 (file)
@@ -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
index 555df913059ed129257a381fcbc317d07de8d929..c51ff034bd2fd3257461ecdffce67dd0cc7fe7f6 100644 (file)
@@ -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"
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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 python25_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"
index 5fa154b1cfb1c4433e1d6aafd41019ea9ea0c9b9..86a646bbbfd28cebe647abf904dad5449b5d864f 100644 (file)
                <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"
@@ -42,8 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Zm200 "
                                Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="false"
+                               WholeProgramOptimization="true"
                                AdditionalIncludeDirectories="..\Include,..\PC"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="generate buildinfo"
-                               CommandLine="make_buildinfo.exe $(ConfigurationName)&#x0D;&#x0A;"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python25.dll"
+                               OutputFile="$(OutDir)\python25.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                IgnoreDefaultLibraryNames="libc"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./python25.pdb"
+                               ProgramDatabaseFile=""
                                SubSystem="2"
-                               LinkTimeCodeGeneration="0"
+                               LinkTimeCodeGeneration="1"
                                BaseAddress="0x1e000000"
-                               ImportLibrary=".\./python25.lib"
+                               ImportLibrary=""
                                TargetMachine="1"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
                        />
                </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"
+                               WholeProgramOptimization="true"
+                               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)\python25.dll"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               IgnoreDefaultLibraryNames="libc"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=""
+                               SubSystem="2"
+                               LinkTimeCodeGeneration="1"
+                               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"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python25_d.dll"
+                               OutputFile="$(OutDir)\python25_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
                        />
                </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"
+                       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"
+                               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)\python25_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"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Get getbuildinfo2.c"
+                               CommandLine="make_buildinfo.exe"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
+                               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"
                        />
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="generate buildinfo"
-                               CommandLine="make_buildinfo.exe $(ConfigurationName)"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python25.dll"
+                               OutputFile="$(OutDir)/python25.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="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine=""
                        />
                </Configuration>
                <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\amd64-temp-release\pythoncore"
+                       Name="PGIRelease|x64"
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Get getbuildinfo2.c"
+                               CommandLine="make_buildinfo.exe"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <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"
                        />
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="generate buildinfo"
-                               CommandLine="make_buildinfo.exe $(ConfigurationName)"
+                               CommandLine=""
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python25.dll"
+                               OutputFile="$(OutDir)/python25.dll"
                                LinkIncremental="1"
                                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"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine=""
                        />
                </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="zlib"
+               <Configuration
+                       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"
+                       />
+                       <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"
+                               CommandLine="copy $(PlatformName)\python.exe $(IntDir)&#x0D;&#x0A;echo running pybench.py -n 1 -C 1 --with-gc ...&#x0D;&#x0A;$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1 -C 1 --with-gc&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\python25.dll"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               IgnoreDefaultLibraryNames="libc"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=""
+                               SubSystem="2"
+                               LinkTimeCodeGeneration="3"
+                               ProfileGuidedDatabase="$(IntDir)\$(TargetName).pgd"
+                               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"
+                       />
+               </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)&#x0D;&#x0A;echo running pybench.py -n 1 -C 1 --with-gc ...&#x0D;&#x0A;$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1 -C 1 --with-gc&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\python25.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"
+                       />
+                       <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>
+                               <FileConfiguration
+                                       Name="Release|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               AdditionalIncludeDirectories="..\Modules\zlib"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               AdditionalIncludeDirectories="..\Modules\zlib"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       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"
+                                               AdditionalIncludeDirectories="..\Modules\zlib"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="PGORelease|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               AdditionalIncludeDirectories="..\Modules\zlib"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="..\Modules\zlib\zutil.c"
+                               >
+                       </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="..\Modules\zlib\adler32.c"
+                               RelativePath="..\Include\genobject.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\compress.c"
+                               RelativePath="..\Include\graminit.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\crc32.c"
+                               RelativePath="..\Include\grammar.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\deflate.c"
+                               RelativePath="..\Include\import.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\gzio.c"
+                               RelativePath="..\Include\intobject.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\infback.c"
+                               RelativePath="..\Include\intrcheck.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\inffast.c"
+                               RelativePath="..\Include\iterobject.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\inflate.c"
+                               RelativePath="..\Include\listobject.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\inftrees.c"
+                               RelativePath="..\Include\longintrepr.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\trees.c"
+                               RelativePath="..\Include\longobject.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\uncompr.c"
+                               RelativePath="..\Include\marshal.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\Modules\zlibmodule.c"
+                               RelativePath="..\Include\metagrammar.h"
                                >
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="ReleaseItanium|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="ReleaseAMD64|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\Modules\zlib\zutil.c"
+                               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>
                        RelativePath="..\Pc\_subprocess.c"
                        >
                </File>
+               <File
+                       RelativePath="..\Modules\_typesmodule.c"
+                       >
+               </File>
                <File
                        RelativePath="..\Modules\_weakref.c"
                        >
                        RelativePath="..\Python\getargs.c"
                        >
                </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"
                        >
                                        AdditionalIncludeDirectories="..\Python"
                                />
                        </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               >
+                               <Tool
+                                       Name="VCCLCompilerTool"
+                                       AdditionalIncludeDirectories="..\Python"
+                               />
+                       </FileConfiguration>
                        <FileConfiguration
                                Name="Debug|Win32"
                                >
                                />
                        </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"
+                                       AdditionalIncludeDirectories="..\Python"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="PGORelease|Win32"
                                >
                                <Tool
                                        Name="VCCLCompilerTool"
                                />
                        </FileConfiguration>
                        <FileConfiguration
-                               Name="ReleaseAMD64|Win32"
+                               Name="PGORelease|x64"
                                >
                                <Tool
                                        Name="VCCLCompilerTool"
index 42716735c09b779a1a9cba38820e01886ae515ff..f692363c5d152635a4f4befe1ff8ef2042b6891c 100644 (file)
@@ -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"
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
index e521fee9e0843bd58c8c57b63ebca7e428c14f86..9d7b43acb68134a7c8f5daedbd0a228183f359bd 100644 (file)
@@ -5,9 +5,10 @@ This directory is used to build Python for Win32 platforms, e.g. Windows
 (a.k.a. Visual Studio 2005).
 (For other Windows platforms and compilers, see ../PC/readme.txt.)
 
-All you need to do is open the workspace "pcbuild.sln" in MSVC++, select
-the Debug or Release setting (using "Solution Configuration" from
-the "Standard" toolbar"), and build the projects.
+All you need to do is open the workspace "pcbuild.sln" in VisualStudio 2005,
+select the platform, select the Debug or Release setting
+(using "Solution Configuration" from the "Standard" toolbar"), and build the
+solution.
 
 The proper order to build subprojects:
 
@@ -25,9 +26,32 @@ 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.
 
+Profile guided Optimization:
+
+There are two special configurations for the pythoncore project and
+the solution.  These are PGIRelease and PGORelease.  They are for
+creating 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.
+
+To create the PGO binaries, first build the Release configuration, then
+build the PGIRelease configuration and finally build the PGORelease
+configuration.  The last stage can take a while to complete as the
+testsuite runs.
+Note that the profile runs are stored in files such as
+Win32\PGIRelease\pythoncore\python25!1.pgc which may
+need to be cleared for fresh builds.
+
 SUBPROJECTS
 -----------
 These subprojects should build out of the box.  Subprojects other than the
@@ -37,12 +61,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
index 97a554b2ccbd71dfe0ccfb2775825ab341ed520c..72888cb541d23a3e29aa30ea54de31a72e04f8b0 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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"
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
index d6c375bcab13bbce3f5292f6124939ddd7f787ce..75d7483de40c50a788c8dbcf9e04f59ad6fbebe6 100644 (file)
@@ -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"
                        />
                        <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
                        />
                </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"
                        />
                        <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
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
                        />
                </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"
                        />
                        <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"
                        />
                        />
                        <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"
index 3539ecc49aad2bb0a4c16a16919b9a20b105b458..c159750343449168b354f29fd0e7aa44d1adca41 100644 (file)
@@ -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"
                        />
                        <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
                                Name="VCPostBuildEventTool"
                        />
                </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"
                        />
                        <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
                                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>
index 6a84ebbe1a8498677cf936c8122a30f928761ae3..6ccb43bfbfe1b1cfa1b447d5fe2d44d6dc7b1779 100644 (file)
@@ -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"
                        <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
                        />
                </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"
                        />
                        <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
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"
                        />
                </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"
                        />
                        <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
                        />
                        <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"