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

Skip to content

Commit ba3febc

Browse files
tirantiran
committed
Fixed merge accident
1 parent 7c086c0 commit ba3febc

1 file changed

Lines changed: 29 additions & 38 deletions

File tree

‎PC/VS7.1/pythoncore.vcproj‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ProjectType="Visual C++"
44
Version="7.10"
55
Name="pythoncore"
6-
ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
6+
ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA30}"
77
RootNamespace="pythoncore"
88
SccProjectName="pythoncore"
99
SccLocalPath="..">
@@ -39,15 +39,15 @@
3939
<Tool
4040
Name="VCLinkerTool"
4141
AdditionalDependencies="getbuildinfo.o"
42-
OutputFile="./python26.dll"
42+
OutputFile="./python30.dll"
4343
LinkIncremental="1"
4444
SuppressStartupBanner="TRUE"
4545
IgnoreDefaultLibraryNames="libc"
4646
GenerateDebugInformation="TRUE"
47-
ProgramDatabaseFile=".\./python26.pdb"
47+
ProgramDatabaseFile=".\./python30.pdb"
4848
SubSystem="2"
4949
BaseAddress="0x1e000000"
50-
ImportLibrary=".\./python26.lib"
50+
ImportLibrary=".\./python30.lib"
5151
TargetMachine="1"/>
5252
<Tool
5353
Name="VCMIDLTool"/>
@@ -99,15 +99,15 @@
9999
<Tool
100100
Name="VCLinkerTool"
101101
AdditionalDependencies="getbuildinfo.o"
102-
OutputFile="./python26_d.dll"
102+
OutputFile="./python30_d.dll"
103103
LinkIncremental="1"
104104
SuppressStartupBanner="TRUE"
105105
IgnoreDefaultLibraryNames="libc"
106106
GenerateDebugInformation="TRUE"
107-
ProgramDatabaseFile=".\./python26_d.pdb"
107+
ProgramDatabaseFile=".\./python30_d.pdb"
108108
SubSystem="2"
109109
BaseAddress="0x1e000000"
110-
ImportLibrary=".\./python26_d.lib"
110+
ImportLibrary=".\./python30_d.lib"
111111
TargetMachine="1"/>
112112
<Tool
113113
Name="VCMIDLTool"/>
@@ -166,15 +166,15 @@
166166
Name="VCLinkerTool"
167167
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
168168
AdditionalDependencies="getbuildinfo.o"
169-
OutputFile="./python26.dll"
169+
OutputFile="./python30.dll"
170170
LinkIncremental="1"
171171
SuppressStartupBanner="FALSE"
172172
IgnoreDefaultLibraryNames="libc"
173173
GenerateDebugInformation="TRUE"
174-
ProgramDatabaseFile=".\./python26.pdb"
174+
ProgramDatabaseFile=".\./python30.pdb"
175175
SubSystem="2"
176176
BaseAddress="0x1e000000"
177-
ImportLibrary=".\./python26.lib"
177+
ImportLibrary=".\./python30.lib"
178178
TargetMachine="0"/>
179179
<Tool
180180
Name="VCMIDLTool"/>
@@ -233,15 +233,15 @@
233233
Name="VCLinkerTool"
234234
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
235235
AdditionalDependencies="getbuildinfo.o"
236-
OutputFile="./python26.dll"
236+
OutputFile="./python30.dll"
237237
LinkIncremental="1"
238238
SuppressStartupBanner="TRUE"
239239
IgnoreDefaultLibraryNames="libc"
240240
GenerateDebugInformation="TRUE"
241-
ProgramDatabaseFile=".\./python26.pdb"
241+
ProgramDatabaseFile=".\./python30.pdb"
242242
SubSystem="2"
243243
BaseAddress="0x1e000000"
244-
ImportLibrary=".\./python26.lib"
244+
ImportLibrary=".\./python30.lib"
245245
TargetMachine="0"/>
246246
<Tool
247247
Name="VCMIDLTool"/>
@@ -368,13 +368,13 @@
368368
RelativePath="..\..\Modules\_csv.c">
369369
</File>
370370
<File
371-
RelativePath="..\..\Modules\_functoolsmodule.c">
371+
RelativePath="..\..\Modules\_fileio.c">
372372
</File>
373373
<File
374-
RelativePath="..\..\Modules\_heapqmodule.c">
374+
RelativePath="..\..\Modules\_functoolsmodule.c">
375375
</File>
376376
<File
377-
RelativePath="..\..\Modules\_hotshot.c">
377+
RelativePath="..\..\Modules\_heapqmodule.c">
378378
</File>
379379
<File
380380
RelativePath="..\..\Modules\_localemodule.c">
@@ -418,6 +418,9 @@
418418
<File
419419
RelativePath="..\..\Python\ast.c">
420420
</File>
421+
<File
422+
RelativePath="..\..\Modules\atexitmodule.c">
423+
</File>
421424
<File
422425
RelativePath="..\..\Modules\audioop.c">
423426
</File>
@@ -434,7 +437,10 @@
434437
RelativePath="..\..\Objects\boolobject.c">
435438
</File>
436439
<File
437-
RelativePath="..\..\Objects\bufferobject.c">
440+
RelativePath="..\..\Objects\bytes_methods.c">
441+
</File>
442+
<File
443+
RelativePath="..\..\Objects\bytesobject.c">
438444
</File>
439445
<File
440446
RelativePath="..\..\Objects\cellobject.c">
@@ -469,9 +475,6 @@
469475
<File
470476
RelativePath="..\..\PC\config.c">
471477
</File>
472-
<File
473-
RelativePath="..\..\Modules\cPickle.c">
474-
</File>
475478
<File
476479
RelativePath="..\..\Modules\cStringIO.c">
477480
</File>
@@ -484,9 +487,6 @@
484487
<File
485488
RelativePath="..\..\Objects\dictobject.c">
486489
</File>
487-
<!--File
488-
RelativePath="..\..\Objects\doubledigits.c">
489-
</File-->
490490
<File
491491
RelativePath="..\..\PC\dl_nt.c">
492492
</File>
@@ -517,6 +517,9 @@
517517
<File
518518
RelativePath="..\..\Objects\frameobject.c">
519519
</File>
520+
<File
521+
RelativePath="..\..\Python\formatter_unicode.c">
522+
</File>
520523
<File
521524
RelativePath="..\..\Python\frozen.c">
522525
</File>
@@ -565,9 +568,6 @@
565568
<File
566569
RelativePath="..\..\Parser\grammar1.c">
567570
</File>
568-
<File
569-
RelativePath="..\..\Modules\imageop.c">
570-
</File>
571571
<File
572572
RelativePath="..\..\Python\import.c">
573573
</File>
@@ -601,9 +601,6 @@
601601
<File
602602
RelativePath="..\..\Python\importdl.c">
603603
</File>
604-
<File
605-
RelativePath="..\..\Objects\intobject.c">
606-
</File>
607604
<File
608605
RelativePath="..\..\Objects\iterobject.c">
609606
</File>
@@ -629,13 +626,10 @@
629626
RelativePath="..\..\Modules\mathmodule.c">
630627
</File>
631628
<File
632-
RelativePath="..\..\Modules\md5.c">
633-
</File>
634-
<File
635-
RelativePath="..\..\Modules\md5module.c">
629+
RelativePath="..\..\Parser\metagrammar.c">
636630
</File>
637631
<File
638-
RelativePath="..\..\Parser\metagrammar.c">
632+
RelativePath="..\..\Objects\memoryobject.c">
639633
</File>
640634
<File
641635
RelativePath="..\..\Objects\methodobject.c">
@@ -732,7 +726,7 @@
732726
RelativePath="..\..\Modules\sha512module.c">
733727
</File>
734728
<File
735-
RelativePath="..\..\Modules\shamodule.c">
729+
RelativePath="..\..\Modules\sha1module.c">
736730
</File>
737731
<File
738732
RelativePath="..\..\Modules\signalmodule.c">
@@ -743,9 +737,6 @@
743737
<File
744738
RelativePath="..\..\Objects\stringobject.c">
745739
</File>
746-
<File
747-
RelativePath="..\..\Modules\stropmodule.c">
748-
</File>
749740
<File
750741
RelativePath="..\..\Python\structmember.c">
751742
</File>

0 commit comments

Comments
 (0)