Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 41be35d

Browse files
tirantiran
committed
Merged revisions 59625-59627 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r59627 | christian.heimes | 2007-12-31 17:17:13 +0100 (Mon, 31 Dec 2007) | 1 line Fixed include paths of PC/VS7.1 ........
1 parent 7a001bc commit 41be35d

20 files changed

Lines changed: 318 additions & 318 deletions

‎PC/VS7.1/_bsddb.vcproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Tool
2121
Name="VCCLCompilerTool"
2222
Optimization="0"
23-
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
23+
AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
2424
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
2525
RuntimeLibrary="3"
2626
UsePrecompiledHeader="2"
@@ -32,7 +32,7 @@
3232
Name="VCCustomBuildTool"/>
3333
<Tool
3434
Name="VCLinkerTool"
35-
AdditionalDependencies="..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
35+
AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
3636
OutputFile="./_bsddb_d.pyd"
3737
LinkIncremental="1"
3838
SuppressStartupBanner="TRUE"
@@ -75,7 +75,7 @@
7575
Name="VCCLCompilerTool"
7676
Optimization="2"
7777
InlineFunctionExpansion="1"
78-
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
78+
AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
7979
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
8080
StringPooling="TRUE"
8181
RuntimeLibrary="2"
@@ -89,7 +89,7 @@
8989
Name="VCCustomBuildTool"/>
9090
<Tool
9191
Name="VCLinkerTool"
92-
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
92+
AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
9393
OutputFile="./_bsddb.pyd"
9494
LinkIncremental="1"
9595
SuppressStartupBanner="TRUE"
@@ -133,7 +133,7 @@
133133
AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
134134
Optimization="2"
135135
InlineFunctionExpansion="1"
136-
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
136+
AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
137137
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
138138
StringPooling="TRUE"
139139
BasicRuntimeChecks="0"
@@ -151,7 +151,7 @@
151151
<Tool
152152
Name="VCLinkerTool"
153153
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
154-
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
154+
AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
155155
OutputFile="./_bsddb.pyd"
156156
LinkIncremental="1"
157157
SuppressStartupBanner="TRUE"
@@ -195,7 +195,7 @@
195195
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
196196
Optimization="2"
197197
InlineFunctionExpansion="1"
198-
AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
198+
AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
199199
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
200200
StringPooling="TRUE"
201201
BasicRuntimeChecks="0"
@@ -213,7 +213,7 @@
213213
<Tool
214214
Name="VCLinkerTool"
215215
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
216-
AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib"
216+
AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib"
217217
OutputFile="./_bsddb.pyd"
218218
LinkIncremental="1"
219219
SuppressStartupBanner="TRUE"
@@ -250,7 +250,7 @@
250250
</References>
251251
<Files>
252252
<File
253-
RelativePath="..\Modules\_bsddb.c">
253+
RelativePath="..\..\Modules\_bsddb.c">
254254
</File>
255255
</Files>
256256
<Globals>

‎PC/VS7.1/_ctypes.vcproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Tool
2121
Name="VCCLCompilerTool"
2222
Optimization="0"
23-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
23+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
2424
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
2525
MinimalRebuild="FALSE"
2626
BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
7474
<Tool
7575
Name="VCCLCompilerTool"
7676
InlineFunctionExpansion="1"
77-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
77+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
7878
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
7979
StringPooling="TRUE"
8080
RuntimeLibrary="2"
@@ -131,7 +131,7 @@
131131
Name="VCCLCompilerTool"
132132
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
133133
InlineFunctionExpansion="1"
134-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
134+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
135135
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
136136
StringPooling="TRUE"
137137
BasicRuntimeChecks="0"
@@ -190,7 +190,7 @@
190190
Name="VCCLCompilerTool"
191191
AdditionalOptions=" /USECL:MS_ITANIUM"
192192
InlineFunctionExpansion="1"
193-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
193+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
194194
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
195195
StringPooling="TRUE"
196196
BasicRuntimeChecks="0"
@@ -244,31 +244,31 @@
244244
</References>
245245
<Files>
246246
<File
247-
RelativePath="..\Modules\_ctypes\_ctypes.c">
247+
RelativePath="..\..\Modules\_ctypes\_ctypes.c">
248248
</File>
249249
<File
250-
RelativePath="..\Modules\_ctypes\callbacks.c">
250+
RelativePath="..\..\Modules\_ctypes\callbacks.c">
251251
</File>
252252
<File
253-
RelativePath="..\Modules\_ctypes\callproc.c">
253+
RelativePath="..\..\Modules\_ctypes\callproc.c">
254254
</File>
255255
<File
256-
RelativePath="..\Modules\_ctypes\cfield.c">
256+
RelativePath="..\..\Modules\_ctypes\cfield.c">
257257
</File>
258258
<File
259-
RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c">
259+
RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c">
260260
</File>
261261
<File
262-
RelativePath="..\Modules\_ctypes\malloc_closure.c">
262+
RelativePath="..\..\Modules\_ctypes\malloc_closure.c">
263263
</File>
264264
<File
265-
RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c">
265+
RelativePath="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c">
266266
</File>
267267
<File
268-
RelativePath="..\Modules\_ctypes\stgdict.c">
268+
RelativePath="..\..\Modules\_ctypes\stgdict.c">
269269
</File>
270270
<File
271-
RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c">
271+
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c">
272272
<FileConfiguration
273273
Name="ReleaseAMD64|Win32"
274274
ExcludedFromBuild="TRUE">
@@ -277,7 +277,7 @@
277277
</FileConfiguration>
278278
</File>
279279
<File
280-
RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm">
280+
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm">
281281
<FileConfiguration
282282
Name="Debug|Win32"
283283
ExcludedFromBuild="TRUE">

‎PC/VS7.1/_ctypes_test.vcproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Tool
2020
Name="VCCLCompilerTool"
2121
Optimization="0"
22-
AdditionalIncludeDirectories="..\Include,..\PC"
22+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
2323
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
2424
MinimalRebuild="FALSE"
2525
BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
7171
<Tool
7272
Name="VCCLCompilerTool"
7373
InlineFunctionExpansion="1"
74-
AdditionalIncludeDirectories="..\Include,..\PC"
74+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
7575
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
7676
StringPooling="TRUE"
7777
RuntimeLibrary="2"
@@ -126,7 +126,7 @@
126126
Name="VCCLCompilerTool"
127127
AdditionalOptions=" /USECL:MS_ITANIUM"
128128
Optimization="0"
129-
AdditionalIncludeDirectories="..\Include,..\PC"
129+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
130130
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
131131
MinimalRebuild="FALSE"
132132
BasicRuntimeChecks="0"
@@ -181,7 +181,7 @@
181181
Name="VCCLCompilerTool"
182182
AdditionalOptions=" /USECL:MS_OPTERON"
183183
InlineFunctionExpansion="1"
184-
AdditionalIncludeDirectories="..\Include,..\PC"
184+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
185185
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
186186
StringPooling="TRUE"
187187
BasicRuntimeChecks="0"
@@ -234,7 +234,7 @@
234234
</References>
235235
<Files>
236236
<File
237-
RelativePath="..\Modules\_ctypes\_ctypes_test.c">
237+
RelativePath="..\..\Modules\_ctypes\_ctypes_test.c">
238238
</File>
239239
</Files>
240240
<Globals>

‎PC/VS7.1/_elementtree.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Tool
2222
Name="VCCLCompilerTool"
2323
Optimization="0"
24-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
24+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
2525
PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
2626
RuntimeLibrary="3"
2727
UsePrecompiledHeader="2"
@@ -75,7 +75,7 @@
7575
Name="VCCLCompilerTool"
7676
Optimization="2"
7777
InlineFunctionExpansion="1"
78-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
78+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
7979
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
8080
StringPooling="TRUE"
8181
RuntimeLibrary="2"
@@ -132,7 +132,7 @@
132132
AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
133133
Optimization="2"
134134
InlineFunctionExpansion="1"
135-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
135+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
136136
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
137137
StringPooling="TRUE"
138138
BasicRuntimeChecks="0"
@@ -193,7 +193,7 @@
193193
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
194194
Optimization="2"
195195
InlineFunctionExpansion="1"
196-
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
196+
AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
197197
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
198198
StringPooling="TRUE"
199199
BasicRuntimeChecks="0"
@@ -247,16 +247,16 @@
247247
</References>
248248
<Files>
249249
<File
250-
RelativePath="..\Modules\_elementtree.c">
250+
RelativePath="..\..\Modules\_elementtree.c">
251251
</File>
252252
<File
253-
RelativePath="..\Modules\expat\xmlparse.c">
253+
RelativePath="..\..\Modules\expat\xmlparse.c">
254254
</File>
255255
<File
256-
RelativePath="..\Modules\expat\xmlrole.c">
256+
RelativePath="..\..\Modules\expat\xmlrole.c">
257257
</File>
258258
<File
259-
RelativePath="..\Modules\expat\xmltok.c">
259+
RelativePath="..\..\Modules\expat\xmltok.c">
260260
</File>
261261
</Files>
262262
<Globals>

‎PC/VS7.1/_msi.vcproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Name="_msi"
66
ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}"
77
SccProjectName="_msi"
8-
SccLocalPath="..\pc">
8+
SccLocalPath="..\..\pc">
99
<Platforms>
1010
<Platform
1111
Name="Win32"/>
@@ -22,7 +22,7 @@
2222
<Tool
2323
Name="VCCLCompilerTool"
2424
Optimization="0"
25-
AdditionalIncludeDirectories="..\Include,..\PC"
25+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
2626
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
2727
BasicRuntimeChecks="3"
2828
RuntimeLibrary="3"
@@ -77,7 +77,7 @@
7777
Name="VCCLCompilerTool"
7878
Optimization="2"
7979
InlineFunctionExpansion="1"
80-
AdditionalIncludeDirectories="..\Include,..\PC"
80+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
8181
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
8282
StringPooling="TRUE"
8383
RuntimeLibrary="2"
@@ -132,7 +132,7 @@
132132
AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
133133
Optimization="2"
134134
InlineFunctionExpansion="1"
135-
AdditionalIncludeDirectories="..\Include,..\PC"
135+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
136136
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
137137
StringPooling="TRUE"
138138
BasicRuntimeChecks="0"
@@ -192,7 +192,7 @@
192192
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
193193
Optimization="2"
194194
InlineFunctionExpansion="1"
195-
AdditionalIncludeDirectories="..\Include,..\PC"
195+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
196196
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
197197
StringPooling="TRUE"
198198
BasicRuntimeChecks="0"
@@ -244,7 +244,7 @@
244244
</References>
245245
<Files>
246246
<File
247-
RelativePath="..\PC\_msi.c">
247+
RelativePath="..\..\PC\_msi.c">
248248
</File>
249249
</Files>
250250
<Globals>

‎PC/VS7.1/_socket.vcproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Tool
2121
Name="VCCLCompilerTool"
2222
Optimization="0"
23-
AdditionalIncludeDirectories="..\Include,..\PC"
23+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
2424
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
2525
RuntimeLibrary="3"
2626
UsePrecompiledHeader="2"
@@ -74,7 +74,7 @@
7474
Name="VCCLCompilerTool"
7575
Optimization="2"
7676
InlineFunctionExpansion="1"
77-
AdditionalIncludeDirectories="..\Include,..\PC"
77+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
7878
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
7979
StringPooling="TRUE"
8080
RuntimeLibrary="2"
@@ -131,7 +131,7 @@
131131
AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
132132
Optimization="2"
133133
InlineFunctionExpansion="1"
134-
AdditionalIncludeDirectories="..\Include,..\PC"
134+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
135135
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
136136
StringPooling="TRUE"
137137
BasicRuntimeChecks="0"
@@ -192,7 +192,7 @@
192192
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
193193
Optimization="2"
194194
InlineFunctionExpansion="1"
195-
AdditionalIncludeDirectories="..\Include,..\PC"
195+
AdditionalIncludeDirectories="..\..\Include,..\..\PC"
196196
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
197197
StringPooling="TRUE"
198198
BasicRuntimeChecks="0"
@@ -246,7 +246,7 @@
246246
</References>
247247
<Files>
248248
<File
249-
RelativePath="..\Modules\socketmodule.c">
249+
RelativePath="..\..\Modules\socketmodule.c">
250250
</File>
251251
</Files>
252252
<Globals>

0 commit comments

Comments
 (0)