Commit 132bbb3d authored by Neal Norwitz's avatar Neal Norwitz

Try to get Windows bots working again. Take 2

parent 094353c4
......@@ -39,15 +39,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python25.dll"
OutputFile="./python26.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python25.pdb"
ProgramDatabaseFile=".\./python26.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python25.lib"
ImportLibrary=".\./python26.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
......@@ -99,15 +99,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python25_d.dll"
OutputFile="./python26_d.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python25_d.pdb"
ProgramDatabaseFile=".\./python26_d.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python25_d.lib"
ImportLibrary=".\./python26_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
......@@ -166,15 +166,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python25.dll"
OutputFile="./python26.dll"
LinkIncremental="1"
SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python25.pdb"
ProgramDatabaseFile=".\./python26.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python25.lib"
ImportLibrary=".\./python26.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
......@@ -233,15 +233,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python25.dll"
OutputFile="./python26.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python25.pdb"
ProgramDatabaseFile=".\./python26.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python25.lib"
ImportLibrary=".\./python26.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
......
......@@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
python25.{dll, lib} in Release mode)
python26.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.
......@@ -26,7 +26,7 @@ The proper order to build subprojects:
test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on.
their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS
-----------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment