summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/msvc_top.mak2
-rw-r--r--common/ugcc_top.mak7
2 files changed, 8 insertions, 1 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index e966cf198..44daca4f6 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -107,6 +107,7 @@ $(GENDIR)/ldgs.tr: FORCE
GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
EXPAT_CFLAGS="$(EXPAT_CFLAGS)" LCMSSRCDIR="$(LCMSSRCDIR)" \
+ LCMS2SRCDIR="$(LCMS2SRCDIR)" \
ICCSRCDIR="$(ICCSRCDIR)" IMDISRCDIR="$(IMDISRCDIR)" \
PNGSRCDIR="$(PNGSRCDIR)" \
SHARE_LIBPNG="$(SHARE_LIBPNG)" \
@@ -154,6 +155,7 @@ $(GENDIR)/ldgs.tr: FORCE
GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
EXPAT_CFLAGS="$(EXPAT_CFLAGS)" LCMSSRCDIR="$(LCMSSRCDIR)" \
+ LCMS2SRCDIR="$(LCMS2SRCDIR)" \
ICCSRCDIR="$(ICCSRCDIR)" IMDISRCDIR="$(IMDISRCDIR)" \
PNGSRCDIR="$(PNGSRCDIR)" \
SHARE_LIBPNG="$(SHARE_LIBPNG)" \
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index 6c7104805..386bd4a91 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -35,6 +35,11 @@ CCAUX=$(CC)
CC_NO_WARN=$(CC_) -Wno-cast-qual -Wno-traditional
CC_SHARED=$(CC_)
+# Which CMS are we using?
+# Options are currently lcms or lcms2
+
+WHICH_CMS=lcms
+
include $(GLSRCDIR)/unixhead.mak
include $(GLSRCDIR)/gs.mak
include $(GLSRCDIR)/lib.mak
@@ -45,7 +50,7 @@ include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/png.mak
include $(GLSRCDIR)/jbig2.mak
include $(GLSRCDIR)/icclib.mak
-include $(GLSRCDIR)/lcms.mak
+include $(GLSRCDIR)/$(WHICH_CMS).mak
include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/tiff.mak
include $(GLSRCDIR)/devs.mak