summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2010-02-17 17:15:53 +0000
committerHenry Stiles <henry.stiles@artifex.com>2010-02-17 17:15:53 +0000
commit250d656f8af185a232af50aedb6ed25d1840e4f9 (patch)
treeafa976482396d3e0db95ef14262c55917d337c37 /main
parentc71f072508db0ca0fa663549e7187ea57918786c (diff)
Michael Vrhel's patches to enable use of the ICC branch with pcl and
pxl. We use a conditional define ICCBRANCH so the languages will compile against the branch and trunk. The corresponding xps changes are forthcoming. git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@10762 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'main')
-rw-r--r--main/pcl6_gcc.mak3
-rw-r--r--main/pcl6_msvc.mak4
2 files changed, 7 insertions, 0 deletions
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index 43b13b28c..f7c32cbc0 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -44,6 +44,9 @@ PNGSRCDIR?=../gs/libpng
# only relevant if not shared
PNGCCFLAGS?=-DPNG_USER_MEM_SUPPORTED
+LCMSSRCDIR?=../gs/lcms
+SHARE_LCMS?=0
+
IMDISRCDIR?=../gs/imdi
# PCL_INCLUDED means pcl + pcl xl
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index ae7cd54de..bda4473b6 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -62,6 +62,10 @@ SHARE_LIBPNG=0
IMDISRCDIR=..\gs\imdi
!endif
+!ifndef LCMSSRCDIR
+LCMSSRCDIR=..\gs\lcms
+!endif
+
!ifndef COMPILE_INITS
COMPILE_INITS=1
!endif