| blob | f1c681aee7f2ad5588c5410bbdbd14c96958a58b |
1 --- misc/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-09-10 18:01:51.000000000 +0200
2 +++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-10-05 22:35:01.607191700 +0200
3 @@ -205,6 +205,10 @@
4 >
5 </File>
6 <File
7 + RelativePath="..\..\..\src\cmshalf.c"
8 + >
9 + </File>
10 + <File
11 RelativePath="..\..\..\src\cmsintrp.c"
12 >
13 </File>
14 --- misc/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-09-10 18:01:51.000000000 +0200
15 +++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-10-05 22:35:28.168963200 +0200
16 @@ -175,6 +175,10 @@
17 >
18 </File>
19 <File
20 + RelativePath="..\..\..\src\cmshalf.c"
21 + >
22 + </File>
23 + <File
24 RelativePath="..\..\..\src\cmsintrp.c"
25 >
26 </File>
27 --- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100
28 +++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100
29 @@ -192,6 +192,15 @@ typedef int cmsBool;
30 # endif
31 #endif
33 +// LibreOffice always builds this as DLL and with the stdcall calling
34 +// convention, so make this usable from outside without having to
35 +// specify CMS_DLL manually whenever the library is used.
36 +#ifndef CMS_DLL_BUILD
37 +#ifndef CMS_DLL
38 +#define CMS_DLL
39 +#endif
40 +#endif
41 +
42 // Calling convention -- this is hardly platform and compiler dependent
43 #ifdef CMS_IS_WINDOWS_
44 # if defined(CMS_DLL) || defined(CMS_DLL_BUILD)