external/python3/python-3.3.0-msvc-x64.patch.1

   1 Fix Python build for x64 Windows
   2
   3 diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
   4 --- python3/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200
   5 +++ python3.new/PCbuild/pcbuild.sln     2012-11-12 22:13:49.445159668 +0100
   6 @@ -104,20 +84,20 @@
   7                 {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
   8                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
   9                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
  10 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
  11 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
  12 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64
  13 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64
  14                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
  15                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
  16 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
  17 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
  18 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
  19 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64
  20                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
  21                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
  22 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
  23 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
  24 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64
  25 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64
  26                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
  27                 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
  28 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
  29 -               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
  30 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64
  31 +               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64
  32                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
  33                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
  34                 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
  35 @@ -168,20 +148,20 @@
  36                 {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
  37                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
  38                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
  39 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
  40 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32
  41 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64
  42 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64
  43                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32
  44                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32
  45 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32
  46 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32
  47 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
  48 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64
  49                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32
  50                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32
  51 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32
  52 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32
  53 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64
  54 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64
  55                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
  56                 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
  57 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32
  58 -               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32
  59 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64
  60 +               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64
  61                 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32
  62                 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32
  63                 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64
  64 @@ -577,38 +557,38 @@
  65                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Debug|x64.Build.0 = Debug|x64
  66                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
  67                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
  68 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32
  69 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0 = PGInstrument|Win32
  70 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
  71 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0 = PGInstrument|x64
  72                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
  73                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
  74 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32
  75 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 = PGUpdate|Win32
  76 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
  77 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 = PGUpdate|x64
  78                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.ActiveCfg = Release|Win32
  79                 {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.Build.0 = Release|Win32
  80 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg = Release|Win32
  81 -               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 = Release|Win32
  82 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg = Release|x64
  83 +               {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 = Release|x64
  84                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.ActiveCfg = Debug|Win32
  85                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.Build.0 = Debug|Win32
  86                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.ActiveCfg = Debug|x64
  87                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.Build.0 = Debug|x64
  88                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
  89                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
  90 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32
  91 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0 = PGInstrument|Win32
  92 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
  93 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0 = PGInstrument|x64
  94                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
  95                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
  96 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32
  97 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 = PGUpdate|Win32
  98 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
  99 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 = PGUpdate|x64
 100                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.ActiveCfg = Release|Win32
 101                 {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.Build.0 = Release|Win32
 102 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg = Release|Win32
 103 -               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 = Release|Win32
 104 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg = Release|x64
 105 +               {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 = Release|x64
 106                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|Win32.ActiveCfg = Debug|Win32
 107                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|x64.ActiveCfg = Debug|x64
 108                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|Win32.ActiveCfg = Release|Win32
 109 -               {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg = Release|Win32
 110 +               {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg = Release|x64
 111                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|Win32.ActiveCfg = Release|Win32
 112 -               {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|Win32
 113 +               {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg = Release|x64
 114                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|Win32.ActiveCfg = Release|Win32
 115                 {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|x64.ActiveCfg = Release|x64
 116         EndGlobalSection
 117 --- python3/PCbuild/make_buildinfo.vcxproj
 118 +++ python3/PCbuild/make_buildinfo.vcxproj
 119 @@ -5,6 +5,10 @@
 120        <Configuration>Release</Configuration>
 121        <Platform>Win32</Platform>
 122      </ProjectConfiguration>
 123 +    <ProjectConfiguration Include="Release|x64">
 124 +      <Configuration>Release</Configuration>
 125 +      <Platform>x64</Platform>
 126 +    </ProjectConfiguration>
 127    </ItemGroup>
 128    <PropertyGroup Label="Globals">
 129      <ProjectGuid>{C73F0EC1-358B-4177-940F-0846AC8B04CD}</ProjectGuid>
 130 @@ -16,6 +20,10 @@
 131      <ConfigurationType>Application</ConfigurationType>
 132      <CharacterSet>NotSet</CharacterSet>
 133    </PropertyGroup>
 134 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 135 +    <ConfigurationType>Application</ConfigurationType>
 136 +    <CharacterSet>NotSet</CharacterSet>
 137 +  </PropertyGroup>
 138    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 139    <ImportGroup Label="ExtensionSettings">
 140    </ImportGroup>
 141 @@ -24,17 +32,38 @@
 142      <Import Project="pyproject.props" />
 143      <Import Project="release.props" />
 144    </ImportGroup>
 145 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 146 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 147 +    <Import Project="pyproject.props" />
 148 +    <Import Project="x64.props" />
 149 +    <Import Project="release.props" />
 150 +  </ImportGroup>
 151    <PropertyGroup Label="UserMacros" />
 152    <PropertyGroup>
 153      <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
 154      <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
 155      <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
 156      <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
 157 +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
 158 +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
 159 +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
 160    </PropertyGroup>
 161    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 162      <ClCompile>
 163        <Optimization>Disabled</Optimization>
 164        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 165 +      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 166 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 167 +    </ClCompile>
 168 +    <Link>
 169 +      <OutputFile>$(OutDir)make_buildinfo.exe</OutputFile>
 170 +      <SubSystem>Console</SubSystem>
 171 +    </Link>
 172 +  </ItemDefinitionGroup>
 173 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 174 +    <ClCompile>
 175 +      <Optimization>Disabled</Optimization>
 176 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 177        <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 178        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 179      </ClCompile>
 180 --- python3/PCbuild/make_versioninfo.vcxproj
 181 +++ python3/PCbuild/make_versioninfo.vcxproj
 182 @@ -114,24 +114,25 @@
 183    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 184      <CustomBuildStep>
 185        <Message>Build PC/pythonnt_rc(_d).h</Message>
 186        <Command>cd $(SolutionDir)
 187 -make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h
 188 +amd64\make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h
 189  </Command>
 190        <Outputs>$(SolutionDir)..\PC\pythonnt_rc.h;%(Outputs)</Outputs>
 191      </CustomBuildStep>
 192      <ClCompile>
 193        <Optimization>MaxSpeed</Optimization>
 194        <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 195        <IntrinsicFunctions>true</IntrinsicFunctions>
 196        <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 197      </ClCompile>
 198      <Link>
 199 -      <OutputFile>$(SolutionDir)make_versioninfo.exe</OutputFile>
 200 +      <OutputFile>$(SolutionDir)amd64\make_versioninfo.exe</OutputFile>
 201 +      <SubSystem>Console</SubSystem>
 202      </Link>
 203      <PostBuildEvent>
 204        <Command>cd $(SolutionDir)
 205 -make_versioninfo.exe &gt; ..\PC\python_nt.h
 206 +amd64\make_versioninfo.exe &gt; ..\PC\python_nt.h
 207  </Command>
 208      </PostBuildEvent>
 209    </ItemDefinitionGroup>
 210    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 211 @@ -172,9 +172,9 @@
 212    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 213      <CustomBuildStep>
 214        <Message>Build PC/pythonnt_rc(_d).h</Message>
 215        <Command>cd $(SolutionDir)
 216 -make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h
 217 +amd64\make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h
 218  </Command>
 219        <Outputs>$(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs)</Outputs>
 220      </CustomBuildStep>
 221      <Midl>
 222 @@ -186,14 +186,15 @@
 223        <IntrinsicFunctions>false</IntrinsicFunctions>
 224        <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 225      </ClCompile>
 226      <Link>
 227 -      <OutputFile>$(SolutionDir)make_versioninfo_d.exe</OutputFile>
 228 +      <OutputFile>$(SolutionDir)amd64\make_versioninfo_d.exe</OutputFile>
 229 +      <SubSystem>Console</SubSystem>
 230        <TargetMachine>MachineX64</TargetMachine>
 231      </Link>
 232      <PostBuildEvent>
 233        <Command>cd $(SolutionDir)
 234 -make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h
 235 +amd64\make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h
 236  </Command>
 237      </PostBuildEvent>
 238    </ItemDefinitionGroup>
 239    <ItemGroup>
 240 --- python3/PCbuild/pythoncore.vcxproj
 241 +++ python3/PCbuild/pythoncore.vcxproj
 242 @@ -195,35 +195,35 @@
 243    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 244      <Midl>
 245        <TargetEnvironment>X64</TargetEnvironment>
 246      </Midl>
 247      <ClCompile>
 248        <AdditionalOptions>/Zm200  %(AdditionalOptions)</AdditionalOptions>
 249        <AdditionalIncludeDirectories>..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 250        <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 251        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 252      </ClCompile>
 253      <ResourceCompile>
 254        <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 255        <Culture>0x0409</Culture>
 256        <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 257      </ResourceCompile>
 258      <PreLinkEvent>
 259        <Message>Generate build information...</Message>
 260 -      <Command>"$(SolutionDir)make_buildinfo.exe" Release "$(IntDir)"</Command>
 261 +      <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Release "$(IntDir)"</Command>
 262      </PreLinkEvent>
 263      <Link>
 264        <AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies>
 265        <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
 266        <BaseAddress>0x1e000000</BaseAddress>
 267      </Link>
 268      <PreBuildEvent>
 269        <Command>$(KillPythonExe)
 270  IF %ERRORLEVEL% NEQ 0 (
 271      echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
 272      exit /b 0
 273  )</Command>
 274      </PreBuildEvent>
 275      <PreBuildEvent>
 276        <Message>Killing any running $(PythonExe) instances...</Message>
 277      </PreBuildEvent>
 278    </ItemDefinitionGroup>
 279 @@ -289,9 +289,9 @@
 280        <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 281      </ResourceCompile>
 282      <PreLinkEvent>
 283        <Message>Generate build information...</Message>
 284 -      <Command>"$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"</Command>
 285 +      <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Debug "$(IntDir)"</Command>
 286      </PreLinkEvent>
 287      <Link>
 288        <AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies>
 289        <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>