?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
fix baseline build (old cairo) - 'cairo_rectangle_int_t' does not name a type
[LibreOffice.git] / external / coinmp / coinmp-vs2013.patch.1
blob2b06c1519a787f386502aac141b35bd4b820e90d
1 -*- Mode:Diff -*-
2 --- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
3 +++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
4 @@ -1,5 +1,5 @@
5  <?xml version="1.0" encoding="utf-8"?>
6 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
8    <ItemGroup Label="ProjectConfigurations">
9      <ProjectConfiguration Include="Debug|Win32">
10        <Configuration>Debug</Configuration>
11 @@ -25,25 +25,25 @@
12    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
13    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
14      <ConfigurationType>StaticLibrary</ConfigurationType>
15 -    <PlatformToolset>v110</PlatformToolset>
16 +    <PlatformToolset>v120</PlatformToolset>
17      <UseOfMfc>false</UseOfMfc>
18      <CharacterSet>MultiByte</CharacterSet>
19    </PropertyGroup>
20    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
21      <ConfigurationType>StaticLibrary</ConfigurationType>
22 -    <PlatformToolset>v110</PlatformToolset>
23 +    <PlatformToolset>v120</PlatformToolset>
24      <UseOfMfc>false</UseOfMfc>
25      <CharacterSet>MultiByte</CharacterSet>
26    </PropertyGroup>
27    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
28      <ConfigurationType>StaticLibrary</ConfigurationType>
29 -    <PlatformToolset>v110</PlatformToolset>
30 +    <PlatformToolset>v120</PlatformToolset>
31      <UseOfMfc>false</UseOfMfc>
32      <CharacterSet>MultiByte</CharacterSet>
33    </PropertyGroup>
34    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
35      <ConfigurationType>StaticLibrary</ConfigurationType>
36 -    <PlatformToolset>v110</PlatformToolset>
37 +    <PlatformToolset>v120</PlatformToolset>
38      <UseOfMfc>false</UseOfMfc>
39      <CharacterSet>MultiByte</CharacterSet>
40    </PropertyGroup>
41 --- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
42 +++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
43 @@ -1,5 +1,5 @@
44  <?xml version="1.0" encoding="utf-8"?>
45 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
46 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
47    <ItemGroup Label="ProjectConfigurations">
48      <ProjectConfiguration Include="Debug|Win32">
49        <Configuration>Debug</Configuration>
50 @@ -26,27 +26,27 @@
51    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
52    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
53      <ConfigurationType>StaticLibrary</ConfigurationType>
54 -    <PlatformToolset>v110</PlatformToolset>
55 +    <PlatformToolset>v120</PlatformToolset>
56      <CharacterSet>Unicode</CharacterSet>
57      <CLRSupport>false</CLRSupport>
58      <WholeProgramOptimization>false</WholeProgramOptimization>
59    </PropertyGroup>
60    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
61      <ConfigurationType>StaticLibrary</ConfigurationType>
62 -    <PlatformToolset>v110</PlatformToolset>
63 +    <PlatformToolset>v120</PlatformToolset>
64      <CharacterSet>Unicode</CharacterSet>
65      <CLRSupport>false</CLRSupport>
66    </PropertyGroup>
67    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
68      <ConfigurationType>StaticLibrary</ConfigurationType>
69 -    <PlatformToolset>v110</PlatformToolset>
70 +    <PlatformToolset>v120</PlatformToolset>
71      <CharacterSet>Unicode</CharacterSet>
72      <CLRSupport>false</CLRSupport>
73      <WholeProgramOptimization>false</WholeProgramOptimization>
74    </PropertyGroup>
75    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
76      <ConfigurationType>StaticLibrary</ConfigurationType>
77 -    <PlatformToolset>v110</PlatformToolset>
78 +    <PlatformToolset>v120</PlatformToolset>
79      <CharacterSet>Unicode</CharacterSet>
80      <CLRSupport>false</CLRSupport>
81    </PropertyGroup>
82 --- coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj
83 +++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj
84 @@ -1,5 +1,5 @@
85  <?xml version="1.0" encoding="utf-8"?>
86 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
87 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
88    <ItemGroup Label="ProjectConfigurations">
89      <ProjectConfiguration Include="Debug|Win32">
90        <Configuration>Debug</Configuration>
91 @@ -25,25 +25,25 @@
92    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
93    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
94      <ConfigurationType>StaticLibrary</ConfigurationType>
95 -    <PlatformToolset>v110</PlatformToolset>
96 +    <PlatformToolset>v120</PlatformToolset>
97      <UseOfMfc>false</UseOfMfc>
98      <CharacterSet>MultiByte</CharacterSet>
99    </PropertyGroup>
100    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
101      <ConfigurationType>StaticLibrary</ConfigurationType>
102 -    <PlatformToolset>v110</PlatformToolset>
103 +    <PlatformToolset>v120</PlatformToolset>
104      <UseOfMfc>false</UseOfMfc>
105      <CharacterSet>MultiByte</CharacterSet>
106    </PropertyGroup>
107    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
108      <ConfigurationType>StaticLibrary</ConfigurationType>
109 -    <PlatformToolset>v110</PlatformToolset>
110 +    <PlatformToolset>v120</PlatformToolset>
111      <UseOfMfc>false</UseOfMfc>
112      <CharacterSet>MultiByte</CharacterSet>
113    </PropertyGroup>
114    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
115      <ConfigurationType>StaticLibrary</ConfigurationType>
116 -    <PlatformToolset>v110</PlatformToolset>
117 +    <PlatformToolset>v120</PlatformToolset>
118      <UseOfMfc>false</UseOfMfc>
119      <CharacterSet>MultiByte</CharacterSet>
120    </PropertyGroup>
121 --- coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj
122 +++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj
123 @@ -1,5 +1,5 @@
124  <?xml version="1.0" encoding="utf-8"?>
125 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
126 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
127    <ItemGroup Label="ProjectConfigurations">
128      <ProjectConfiguration Include="Debug|Win32">
129        <Configuration>Debug</Configuration>
130 @@ -25,25 +25,25 @@
131    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
132    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
133      <ConfigurationType>StaticLibrary</ConfigurationType>
134 -    <PlatformToolset>v110</PlatformToolset>
135 +    <PlatformToolset>v120</PlatformToolset>
136      <UseOfMfc>false</UseOfMfc>
137      <CharacterSet>MultiByte</CharacterSet>
138    </PropertyGroup>
139    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
140      <ConfigurationType>StaticLibrary</ConfigurationType>
141 -    <PlatformToolset>v110</PlatformToolset>
142 +    <PlatformToolset>v120</PlatformToolset>
143      <UseOfMfc>false</UseOfMfc>
144      <CharacterSet>MultiByte</CharacterSet>
145    </PropertyGroup>
146    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
147      <ConfigurationType>StaticLibrary</ConfigurationType>
148 -    <PlatformToolset>v110</PlatformToolset>
149 +    <PlatformToolset>v120</PlatformToolset>
150      <UseOfMfc>false</UseOfMfc>
151      <CharacterSet>MultiByte</CharacterSet>
152    </PropertyGroup>
153    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
154      <ConfigurationType>StaticLibrary</ConfigurationType>
155 -    <PlatformToolset>v110</PlatformToolset>
156 +    <PlatformToolset>v120</PlatformToolset>
157      <UseOfMfc>false</UseOfMfc>
158      <CharacterSet>MultiByte</CharacterSet>
159    </PropertyGroup>
160 --- coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj
161 +++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj
162 @@ -1,5 +1,5 @@
163  <?xml version="1.0" encoding="utf-8"?>
164 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
165 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
166    <ItemGroup Label="ProjectConfigurations">
167      <ProjectConfiguration Include="Debug|Win32">
168        <Configuration>Debug</Configuration>
169 @@ -25,25 +25,25 @@
170    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
171    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
172      <ConfigurationType>StaticLibrary</ConfigurationType>
173 -    <PlatformToolset>v110</PlatformToolset>
174 +    <PlatformToolset>v120</PlatformToolset>
175      <UseOfMfc>false</UseOfMfc>
176      <CharacterSet>MultiByte</CharacterSet>
177    </PropertyGroup>
178    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
179      <ConfigurationType>StaticLibrary</ConfigurationType>
180 -    <PlatformToolset>v110</PlatformToolset>
181 +    <PlatformToolset>v120</PlatformToolset>
182      <UseOfMfc>false</UseOfMfc>
183      <CharacterSet>MultiByte</CharacterSet>
184    </PropertyGroup>
185    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
186      <ConfigurationType>StaticLibrary</ConfigurationType>
187 -    <PlatformToolset>v110</PlatformToolset>
188 +    <PlatformToolset>v120</PlatformToolset>
189      <UseOfMfc>false</UseOfMfc>
190      <CharacterSet>MultiByte</CharacterSet>
191    </PropertyGroup>
192    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
193      <ConfigurationType>StaticLibrary</ConfigurationType>
194 -    <PlatformToolset>v110</PlatformToolset>
195 +    <PlatformToolset>v120</PlatformToolset>
196      <UseOfMfc>false</UseOfMfc>
197      <CharacterSet>MultiByte</CharacterSet>
198    </PropertyGroup>
199 --- coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj
200 +++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj
201 @@ -1,5 +1,5 @@
202  <?xml version="1.0" encoding="utf-8"?>
203 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
204 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
205    <ItemGroup Label="ProjectConfigurations">
206      <ProjectConfiguration Include="Debug|Win32">
207        <Configuration>Debug</Configuration>
208 @@ -26,24 +26,24 @@
209    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
210    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
211      <ConfigurationType>DynamicLibrary</ConfigurationType>
212 -    <PlatformToolset>v110</PlatformToolset>
213 +    <PlatformToolset>v120</PlatformToolset>
214      <CharacterSet>Unicode</CharacterSet>
215      <WholeProgramOptimization>true</WholeProgramOptimization>
216    </PropertyGroup>
217    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
218      <ConfigurationType>DynamicLibrary</ConfigurationType>
219 -    <PlatformToolset>v110</PlatformToolset>
220 +    <PlatformToolset>v120</PlatformToolset>
221      <CharacterSet>MultiByte</CharacterSet>
222    </PropertyGroup>
223    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
224      <ConfigurationType>DynamicLibrary</ConfigurationType>
225 -    <PlatformToolset>v110</PlatformToolset>
226 +    <PlatformToolset>v120</PlatformToolset>
227      <CharacterSet>Unicode</CharacterSet>
228      <WholeProgramOptimization>true</WholeProgramOptimization>
229    </PropertyGroup>
230    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
231      <ConfigurationType>DynamicLibrary</ConfigurationType>
232 -    <PlatformToolset>v110</PlatformToolset>
233 +    <PlatformToolset>v120</PlatformToolset>
234      <CharacterSet>MultiByte</CharacterSet>
235    </PropertyGroup>
236    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
237 --- coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
238 +++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
239 @@ -1,5 +1,5 @@
240  <?xml version="1.0" encoding="utf-8"?>
241 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
242 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
243    <ItemGroup Label="ProjectConfigurations">
244      <ProjectConfiguration Include="Debug|Win32">
245        <Configuration>Debug</Configuration>
246 @@ -26,24 +26,24 @@
247    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
248    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
249      <ConfigurationType>Application</ConfigurationType>
250 -    <PlatformToolset>v110</PlatformToolset>
251 +    <PlatformToolset>v120</PlatformToolset>
252      <CharacterSet>Unicode</CharacterSet>
253      <WholeProgramOptimization>true</WholeProgramOptimization>
254    </PropertyGroup>
255    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
256      <ConfigurationType>Application</ConfigurationType>
257 -    <PlatformToolset>v110</PlatformToolset>
258 +    <PlatformToolset>v120</PlatformToolset>
259      <CharacterSet>Unicode</CharacterSet>
260    </PropertyGroup>
261    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
262      <ConfigurationType>Application</ConfigurationType>
263 -    <PlatformToolset>v110</PlatformToolset>
264 +    <PlatformToolset>v120</PlatformToolset>
265      <CharacterSet>Unicode</CharacterSet>
266      <WholeProgramOptimization>true</WholeProgramOptimization>
267    </PropertyGroup>
268    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
269      <ConfigurationType>Application</ConfigurationType>
270 -    <PlatformToolset>v110</PlatformToolset>
271 +    <PlatformToolset>v120</PlatformToolset>
272      <CharacterSet>Unicode</CharacterSet>
273    </PropertyGroup>
274    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
275 --- coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj
276 +++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj
277 @@ -1,5 +1,5 @@
278  <?xml version="1.0" encoding="utf-8"?>
279 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
280 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
281    <ItemGroup Label="ProjectConfigurations">
282      <ProjectConfiguration Include="Debug|Win32">
283        <Configuration>Debug</Configuration>
284 @@ -25,25 +25,25 @@
285    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
286    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
287      <ConfigurationType>StaticLibrary</ConfigurationType>
288 -    <PlatformToolset>v110</PlatformToolset>
289 +    <PlatformToolset>v120</PlatformToolset>
290      <UseOfMfc>false</UseOfMfc>
291      <CharacterSet>MultiByte</CharacterSet>
292    </PropertyGroup>
293    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
294      <ConfigurationType>StaticLibrary</ConfigurationType>
295 -    <PlatformToolset>v110</PlatformToolset>
296 +    <PlatformToolset>v120</PlatformToolset>
297      <UseOfMfc>false</UseOfMfc>
298      <CharacterSet>MultiByte</CharacterSet>
299    </PropertyGroup>
300    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
301      <ConfigurationType>StaticLibrary</ConfigurationType>
302 -    <PlatformToolset>v110</PlatformToolset>
303 +    <PlatformToolset>v120</PlatformToolset>
304      <UseOfMfc>false</UseOfMfc>
305      <CharacterSet>MultiByte</CharacterSet>
306    </PropertyGroup>
307    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
308      <ConfigurationType>StaticLibrary</ConfigurationType>
309 -    <PlatformToolset>v110</PlatformToolset>
310 +    <PlatformToolset>v120</PlatformToolset>
311      <UseOfMfc>false</UseOfMfc>
312      <CharacterSet>MultiByte</CharacterSet>
313    </PropertyGroup>
314 --- coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj
315 +++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj
316 @@ -1,5 +1,5 @@
317  <?xml version="1.0" encoding="utf-8"?>
318 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
319 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
320    <ItemGroup Label="ProjectConfigurations">
321      <ProjectConfiguration Include="Debug|Win32">
322        <Configuration>Debug</Configuration>
323 @@ -24,25 +24,25 @@
324    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
325    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
326      <ConfigurationType>StaticLibrary</ConfigurationType>
327 -    <PlatformToolset>v110</PlatformToolset>
328 +    <PlatformToolset>v120</PlatformToolset>
329      <UseOfMfc>false</UseOfMfc>
330      <CharacterSet>MultiByte</CharacterSet>
331    </PropertyGroup>
332    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
333      <ConfigurationType>StaticLibrary</ConfigurationType>
334 -    <PlatformToolset>v110</PlatformToolset>
335 +    <PlatformToolset>v120</PlatformToolset>
336      <UseOfMfc>false</UseOfMfc>
337      <CharacterSet>MultiByte</CharacterSet>
338    </PropertyGroup>
339    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
340      <ConfigurationType>StaticLibrary</ConfigurationType>
341 -    <PlatformToolset>v110</PlatformToolset>
342 +    <PlatformToolset>v120</PlatformToolset>
343      <UseOfMfc>false</UseOfMfc>
344      <CharacterSet>MultiByte</CharacterSet>
345    </PropertyGroup>
346    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
347      <ConfigurationType>StaticLibrary</ConfigurationType>
348 -    <PlatformToolset>v110</PlatformToolset>
349 +    <PlatformToolset>v120</PlatformToolset>
350      <UseOfMfc>false</UseOfMfc>
351      <CharacterSet>MultiByte</CharacterSet>
352    </PropertyGroup>
FREE OFFICE SUITE