[Libreoffice-commits] .: libcdr/libcdr-0.0.5.patch

[Tor Lillqvist]

 libcdr/libcdr-0.0.5.patch |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Mar 19 09:40:19 2012 +0200

    lcms2 uses stdcall for some reason

diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch
index b622bd6..279c365 100644
--- a/libcdr/libcdr-0.0.5.patch
+++ b/libcdr/libcdr-0.0.5.patch
@@ -18,3 +18,18 @@
  
  #endif
  
+--- misc/libcdr-0.0.5/src/lib/makefile.mk
++++ misc/build/libcdr-0.0.5/src/lib/makefile.mk
+@@ -32,6 +32,12 @@
+ INCPRE+=$(LCMS2_CFLAGS)
+ .ELSE
+ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
++.IF "$(COM)" == "MSC"
++# lcms2 gets built to use the stdcall calling convention, for some reason.
++# The lcms2 headers need this in order to decorate functions with stdcall,
++# so that they will be found when linking.
++CDEFS+=-DCMS_DLL
++.ENDIF
+ .ENDIF
+ 
+ .IF "$(SYSTEM_ZLIB)" != "YES"