diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2011-03-24 17:26:17 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2011-03-24 17:26:17 +0000 |
| commit | 1166642585c474864f17fb300c5966594dcee382 (patch) | |
| tree | c53a519042f6e2e06bf03f61f7f438fed26e911c /common | |
| parent | dc00a713f72908ba2482fa3fd709f4571c4d9201 (diff) | |
Resolve build issues with language_switch and UFST.
I had (wrongly) assumed that the PCL/language_switch builds with UFST
and COMPILE_INITS=1 would have the relevant paths correctly setup for
the PS/PDF world to access the Microtype FCOs. It turns out they are
done in an incompatible manner.
So, I've renamed the path variables (in the makefiles) so there isn't
a clash between PCL and PS/PDF, ensured that the variables are correctly
passed through recursive (n)make calls, and tidied up the FAPI options
for the language_switch build.
Not only does this allow language_switch to build with the UFST, but the
Postscript interpreter does now use FAPI/UFST to access the Microtype fonts
for the built-in fonts, and uses FAPI/Freetype for downloaded fonts.
Bug 692093
No cluster differences expected.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12308 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'common')
| -rw-r--r-- | common/msvc_top.mak | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak index d7d527d77..e966cf198 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -117,14 +117,14 @@ $(GENDIR)/ldgs.tr: FORCE ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \ PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \ PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\ - FTSRCDIR="$(FTSRCDIR)" \ DEVSTUDIO="$(DEVSTUDIO)" \ XCFLAGS="$(XCFLAGS)" \ SBRFLAGS="$(SBRFLAGS)" \ 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)" \ - UFST_CFLAGS="$(UFST_CFLAGS)" \ + UFST_CFLAGS="$(UFST_CFLAGS)" UFSTROMFONTDIR="$(UFSTROMFONTDIR)" UFSTDISCFONTDIR="$(UFSTDISCFONTDIR)"\ + FT_BRIDGE=$(FT_BRIDGE) SHARE_FT=$(SHARE_FT) FTSRCDIR=$(FTSRCDIR) FT_CFLAGS=$(FT_CFLAGS) FT_LIBS=$(FT_LIBS) \ FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \ BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \ CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \ @@ -164,14 +164,14 @@ $(GENDIR)/ldgs.tr: FORCE ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \ PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \ PSLIBDIR=$(PSLIBDIR) PSRESDIR=$(PSRESDIR)\ - FTSRCDIR="$(FTSRCDIR)" \ DEVSTUDIO="$(DEVSTUDIO)" \ XCFLAGS="$(XCFLAGS)" \ SBRFLAGS="$(SBRFLAGS)" \ 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)" \ - UFST_CFLAGS="$(UFST_CFLAGS)" \ + UFST_CFLAGS="$(UFST_CFLAGS)" UFSTROMFONTDIR="$(UFSTROMFONTDIR)" UFSTDISCFONTDIR="$(UFSTDISCFONTDIR)"\ + FT_BRIDGE=$(FT_BRIDGE) SHARE_FT=$(SHARE_FT) FTSRCDIR=$(FTSRCDIR) FT_CFLAGS=$(FT_CFLAGS) FT_LIBS=$(FT_LIBS) \ PSD="$(GENDIR)/" \ FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \ BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \ |