diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-19 09:42:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-19 09:42:19 +0200 |
| commit | f257c29b6cfba0110bafe33bc02003cc757b5999 (patch) | |
| tree | bad53eab40af5814538f5bb298ecbb50b4bbb3e9 /libcdr | |
| parent | 85f074554788e2d8da73e77855ca06bc0fdfbaa4 (diff) | |
Revert "lcms2 uses stdcall for some reason"
Nah, will use the patch by Lubos instead.
This reverts commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4.
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/libcdr-0.0.5.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libcdr/libcdr-0.0.5.patch b/libcdr/libcdr-0.0.5.patch index 279c365e346b..b622bd6a45e0 100644 --- a/libcdr/libcdr-0.0.5.patch +++ b/libcdr/libcdr-0.0.5.patch @@ -18,18 +18,3 @@ #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" |