← Back to branch summary

~ubuntu-branches/debian/squeeze/protobuf/squeeze

« back to all changes in this revision

Viewing changes to vsprojects/libprotobuf.vcproj

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2009-06-02 16:19:00 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090602161900-vm176i3ryt35yk91
Tags: 2.0.3-2.2
* Non-maintainer upload.
* Fix FTBFS from -2.1: don't fail when we can't clean up the java build,
  such as when openjdk isn't installed.
* Disable parallel builds, because libtool is made of fail (if binary-arch
  and build-indep run concurrently, we relink a library while it's being
  used; that doesn't work so well).

Show diffs side-by-side

added added

removed removed

Lines of Context:
vsprojects/libprotobuf.vcproj
19
19
                        Name="Debug|Win32"
20
20
                        OutputDirectory="Debug"
21
21
                        IntermediateDirectory="Debug"
22
 
                        ConfigurationType="2"
 
22
                        ConfigurationType="4"
23
23
                        >
24
24
                        <Tool
25
25
                                Name="VCPreBuildEventTool"
60
60
                                Name="VCPreLinkEventTool"
61
61
                        />
62
62
                        <Tool
63
 
                                Name="VCLinkerTool"
64
 
                                LinkIncremental="2"
65
 
                                GenerateDebugInformation="true"
66
 
                                SubSystem="2"
67
 
                                TargetMachine="1"
 
63
                                Name="VCLibrarianTool"
68
64
                        />
69
65
                        <Tool
70
66
                                Name="VCALinkTool"
71
67
                        />
72
68
                        <Tool
73
 
                                Name="VCManifestTool"
74
 
                        />
75
 
                        <Tool
76
69
                                Name="VCXDCMakeTool"
77
70
                        />
78
71
                        <Tool
82
75
                                Name="VCFxCopTool"
83
76
                        />
84
77
                        <Tool
85
 
                                Name="VCAppVerifierTool"
86
 
                        />
87
 
                        <Tool
88
78
                                Name="VCPostBuildEventTool"
89
79
                        />
90
80
                </Configuration>
92
82
                        Name="Release|Win32"
93
83
                        OutputDirectory="Release"
94
84
                        IntermediateDirectory="Release"
95
 
                        ConfigurationType="2"
 
85
                        ConfigurationType="4"
96
86
                        >
97
87
                        <Tool
98
88
                                Name="VCPreBuildEventTool"
130
120
                                Name="VCPreLinkEventTool"
131
121
                        />
132
122
                        <Tool
133
 
                                Name="VCLinkerTool"
134
 
                                LinkIncremental="2"
135
 
                                GenerateDebugInformation="true"
136
 
                                SubSystem="2"
137
 
                                OptimizeReferences="2"
138
 
                                EnableCOMDATFolding="2"
139
 
                                TargetMachine="1"
 
123
                                Name="VCLibrarianTool"
140
124
                        />
141
125
                        <Tool
142
126
                                Name="VCALinkTool"
143
127
                        />
144
128
                        <Tool
145
 
                                Name="VCManifestTool"
146
 
                        />
147
 
                        <Tool
148
129
                                Name="VCXDCMakeTool"
149
130
                        />
150
131
                        <Tool
154
135
                                Name="VCFxCopTool"
155
136
                        />
156
137
                        <Tool
157
 
                                Name="VCAppVerifierTool"
158
 
                        />
159
 
                        <Tool
160
138
                                Name="VCPostBuildEventTool"
161
139
                        />
162
140
                </Configuration>
378
356
                                >
379
357
                        </File>
380
358
                        <File
 
359
                                RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
 
360
                                >
 
361
                        </File>
 
362
                        <File
381
363
                                RelativePath="..\src\google\protobuf\text_format.cc"
382
364
                                >
383
365
                        </File>