summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2010-04-23 13:02:38 +0000
committerChris Liddell <chris.liddell@artifex.com>2010-04-23 13:02:38 +0000
commit558bff47bc99bbf3278ae8c1ffa0bd3bfa47b8dd (patch)
tree77aacb401b698dd4cd71a11f5074e61cb94a5d38
parentf41e1da4b785a23062dd4f52c6de9d310b9853ab (diff)
Resolve issues with the Linux language_switch build of Ghostscript, since Freetype enabled is now the default for GS.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@11114 a1074d23-0009-0410-80fe-cf8c14f379e6
-rw-r--r--common/ugcc_top.mak2
-rw-r--r--language_switch/pspcl6_gcc.mak6
2 files changed, 6 insertions, 2 deletions
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index ca48c8536..1eea98f29 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -52,7 +52,7 @@ include $(GLSRCDIR)/contrib.mak
include $(GLSRCDIR)/unix-aux.mak
include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/version.mak
-
+include $(GLSRCDIR)/freetype.mak
UGCC_TOP_DIR:
@if test ! -d $(GLGENDIR); then mkdir $(GLGENDIR); fi
diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak
index 40ad3e614..76d44d6e0 100644
--- a/language_switch/pspcl6_gcc.mak
+++ b/language_switch/pspcl6_gcc.mak
@@ -54,7 +54,11 @@ PSICFLAGS?=-DPSI_INCLUDED
PDL_INCLUDE_FLAGS?=-DPCL_INCLUDED $(PSICFLAGS)
# Choose FT_BRIDGE=1 to use the freetype rasterizer
-FT_BRIDGE?=0
+FT_BRIDGE?=1
+SHARE_FT?=0
+FTSRCDIR?=$(GLSRCDIR)/../freetype
+FT_CFLAGS?=-I$(FTSRCDIR)/include
+FT_LIBS?=
DD=$(GLGENDIR)/