diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-03-28 21:55:29 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-03-28 21:55:29 (GMT) |
| commit | 94eba715add289a023b26132289ec00e5b7669c9 (patch) | |
| tree | 08937f9c7e9b7291d5f59bf17ef979ac9336046f /PC/VS8.0 | |
| parent | 41cf50d613f90fa5a2c243b6ecd8d50f302f3f50 (diff) | |
| download | cpython-94eba715add289a023b26132289ec00e5b7669c9.zip cpython-94eba715add289a023b26132289ec00e5b7669c9.tar.gz cpython-94eba715add289a023b26132289ec00e5b7669c9.tar.bz2 | |
Repair compilation for Visual Studio 2005.
I applied the same changes manually to VS7.1 and VC6 files; completely untested.
(Christian, don't try too hard merging this change into py3k.
It will be easier to do the same work again on the branch)
Diffstat (limited to 'PC/VS8.0')
| -rw-r--r-- | PC/VS8.0/_elementtree.vcproj | 8 | ||||
| -rw-r--r-- | PC/VS8.0/make_versioninfo.vcproj | 2 | ||||
| -rw-r--r-- | PC/VS8.0/python.vcproj | 8 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 28 |
4 files changed, 26 insertions, 20 deletions
diff --git a/PC/VS8.0/_elementtree.vcproj b/PC/VS8.0/_elementtree.vcproj index 32fac0c..457da72 100644 --- a/PC/VS8.0/_elementtree.vcproj +++ b/PC/VS8.0/_elementtree.vcproj @@ -56,7 +56,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -119,7 +118,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -182,7 +180,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -246,7 +243,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -309,7 +305,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -373,7 +368,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@@ -437,7 +431,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -501,7 +494,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj index b097162..9dbf10d 100644 --- a/PC/VS8.0/make_versioninfo.vcproj +++ b/PC/VS8.0/make_versioninfo.vcproj @@ -67,7 +67,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -211,7 +210,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
diff --git a/PC/VS8.0/python.vcproj b/PC/VS8.0/python.vcproj index 7d10e14..bea0376 100644 --- a/PC/VS8.0/python.vcproj +++ b/PC/VS8.0/python.vcproj @@ -62,7 +62,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -136,7 +135,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -211,7 +209,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -287,7 +284,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -360,7 +356,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -435,7 +430,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -510,7 +504,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -585,7 +578,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index 2bbfec4..e2ce1f8 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -655,6 +655,14 @@ >
</File>
<File
+ RelativePath="..\..\Include\bytesobject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Include\bytes_methods.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Include\cellobject.h"
>
</File>
@@ -979,6 +987,10 @@ >
</File>
<File
+ RelativePath="..\..\Modules\_fileio.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
</File>
@@ -1051,6 +1063,10 @@ >
</File>
<File
+ RelativePath="..\..\Modules\future_builtins.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\gcmodule.c"
>
</File>
@@ -1343,6 +1359,14 @@ >
</File>
<File
+ RelativePath="..\..\Objects\bytesobject.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Objects\bytes_methods.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Objects\cellobject.c"
>
</File>
@@ -1627,11 +1651,11 @@ >
</File>
<File
- RelativePath="..\Python\formatter_string.c"
+ RelativePath="..\..\Python\formatter_string.c"
>
</File>
<File
- RelativePath="..\Python\formatter_unicode.c"
+ RelativePath="..\..\Python\formatter_unicode.c"
>
</File>
<File
|