blob: 279c365e346ba711a92c4a06cbb37aa5eca80a14 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- misc/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-07 13:51:21.000000000 +0100
+++ misc/build/libcdr-0.0.5/src/lib/libcdr_utils.h 2012-03-08 12:46:38.194534604 +0100
@@ -54,17 +54,8 @@
#else
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDINT_H
#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
-#endif
#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"
|
