diff options
| author | Ralph Giles <ralph.giles@artifex.com> | 2006-09-07 00:37:18 +0000 |
|---|---|---|
| committer | Ralph Giles <ralph.giles@artifex.com> | 2006-09-07 00:37:18 +0000 |
| commit | b71fa6e82d9df223f8aa9ef6ef7807b1a45fee76 (patch) | |
| tree | 014ef529f92d95605913fb66b52483b6bf9ab8bd /common/ugcc_top.mak | |
| parent | 71f00fabef54048d9bc0d6ef725e5884098eabac (diff) | |
Merge the gs853merge branch down into the trunk. This ports ghostpcl and
ghostxps to build against a branch of ghostscript close it its current
mainline (around r7000) between Ghostscript 8.54 and 8.55.
This mostly consists of removing the memory pointers from many calls as
well as a few other api changes, as well as some makefile updates, which
were skewed between the branches.
Nevertheless this is a big merge and there are likely to be a few
mistakes. The previous trunk is tagged as /tags/ghostpcl-pre855merge
for comparision.
Both pcl6 and pspcl6 build and run with the Artifex font scaler (the
native gs one). pcl6 compiles but does not link with ufst. pspcl6 does
not compile with ufst, but that's not too different from what was
happening in the branch. Fixing this will of course come next.
git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2566 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'common/ugcc_top.mak')
| -rw-r--r-- | common/ugcc_top.mak | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak index 449335b86..51caf4507 100644 --- a/common/ugcc_top.mak +++ b/common/ugcc_top.mak @@ -6,7 +6,7 @@ # The product-specific top-level makefile defines the following: # MAKEFILE, CCLD, COMMONDIR, CONFIG, DEVICE_DEVS, -# GCFLAGS, GENDIR, GLSRCDIR, GLGENDIR, GLOBJDIR, +# GCFLAGS, GENDIR, GLSRCDIR, GLGENDIR, GLOBJDIR, PSD # TOP_OBJ, MAIN_OBJ, TARGET_DEVS, TARGET_XE # It also must include the product-specific *.mak. @@ -66,10 +66,12 @@ $(GENDIR)/ldgs.tr: FORCE BAND_LIST_STORAGE=memory BAND_LIST_COMPRESSOR=zlib \ ZSRCDIR=$(ZSRCDIR) ZGENDIR=$(ZGENDIR) ZOBJDIR=$(ZOBJDIR) ZLIB_NAME=$(ZLIB_NAME) SHARE_ZLIB=$(SHARE_ZLIB) \ JSRCDIR=$(JSRCDIR) JGENDIR=$(JGENDIR) JOBJDIR=$(JOBJDIR) \ - GLSRCDIR='$(GLSRCDIR)' PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \ + GLSRCDIR='$(GLSRCDIR)' PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) PSD='$(GENDIR)/' \ GLGENDIR='$(GLGENDIR)' GLOBJDIR='$(GLOBJDIR)' PSLIBDIR=$(PSLIBDIR) \ ICCSRCDIR=$(ICCSRCDIR) \ - COMPILE_INITS=$(COMPILE_INITS) \ + COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS='$(PCLXL_ROMFS_ARGS)' PJL_ROMFS_ARGS='$(PJL_ROMFS_ARGS)' \ + UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \ + UFST_ROMFS_ARGS='$(UFST_ROMFS_ARGS)' \ PSRCDIR=$(PSRCDIR) PVERSION=$(PVERSION) PSOBJDIR=$(GENDIR) SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \ -f $(GLSRCDIR)/unix-gcc.mak\ $(GLOBJDIR)/ld.tr \ @@ -100,9 +102,13 @@ $(GENDIR)/ldgs.tr: FORCE BAND_LIST_STORAGE=memory BAND_LIST_COMPRESSOR=zlib \ ZSRCDIR=$(ZSRCDIR) ZGENDIR=$(ZGENDIR) ZOBJDIR=$(ZOBJDIR) ZLIB_NAME=$(ZLIB_NAME) SHARE_ZLIB=$(SHARE_ZLIB) \ JSRCDIR=$(JSRCDIR) JGENDIR=$(JGENDIR) JOBJDIR=$(JOBJDIR) \ + GLSRCDIR='$(GLSRCDIR)' PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) PSD='$(GENDIR)/' \ + GLGENDIR='$(GLGENDIR)' GLOBJDIR='$(GLOBJDIR)' PSLIBDIR=$(PSLIBDIR) \ + ICCSRCDIR=$(ICCSRCDIR) \ + COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS='$(PCLXL_ROMFS_ARGS)' PJL_ROMFS_ARGS='$(PJL_ROMFS_ARGS)' \ + UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \ + UFST_ROMFS_ARGS='$(UFST_ROMFS_ARGS)' \ PSRCDIR=$(PSRCDIR) PVERSION=$(PVERSION) PSOBJDIR=$(GENDIR) SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \ - GLSRCDIR='$(GLSRCDIR)' \ - GLGENDIR='$(GLGENDIR)' GLOBJDIR='$(GLOBJDIR)' \ -f $(GLSRCDIR)/ugcclib.mak \ $(GLOBJDIR)/ld.tr \ $(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gsfemu.o \ |