summaryrefslogtreecommitdiff
path: root/gpdl
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2020-09-17 08:26:44 +0100
committerChris Liddell <chris.liddell@artifex.com>2020-10-06 17:05:29 +0100
commitaaeccfffecee65225dabac32689a15a239d01681 (patch)
tree6b2ecbc8ffd8c9aebab40d10744804564c65779e /gpdl
parent978df385c36ee4d65c9144924d0224243a5ebb71 (diff)
downloadghostpdl-aaeccfffecee65225dabac32689a15a239d01681.tar.gz
Change order of compiler options for third party libs
Move the compiler parameters around so the third party lib specific -I options come first - hopefully meaning we'll favor any included headers over those in the system include path(s). This assumes the compiler searched include directives given on the command line left to right. Apparently this used to be a problem, I've not found a recent compiler that breaks that assumption (yet!). This applies to: expat, freetype, ijs, jbig2dec, jpeg, jpegxr, openjpeg, png tiff and zlib
Diffstat (limited to 'gpdl')
-rw-r--r--gpdl/gpdl.mak5
1 files changed, 4 insertions, 1 deletions
diff --git a/gpdl/gpdl.mak b/gpdl/gpdl.mak
index f381c8b23..fa8e48faf 100644
--- a/gpdl/gpdl.mak
+++ b/gpdl/gpdl.mak
@@ -72,6 +72,9 @@ LANG_CFLAGS=\
GPDLCC=$(CC_) $(LANG_CFLAGS) $(I_)$(PSSRCDIR)$(_I) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
+GPDLJB2CC=$(CC) $(LANG_CFLAGS) $(I_)$(LDF_JB2I_) $(JBIG2_CFLAGS) $(II)$(JB2I_)$(_I) $(I_)$(PSSRCDIR)$(_I) $(I_)$(PLSRCDIR)$(_I) \
+$(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(CCFLAGS) $(C_)
+
$(GPDLGEN)gpdlimpl.c: $(PLSRC)plimpl.c $(MAKEDIRS)
$(CP_) $(PLSRC)plimpl.c $(GPDLGEN)gpdlimpl.c
@@ -128,7 +131,7 @@ $(GPDL_TIFF_TOP_OBJ): $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ)
$(GPDL_JBIG2_TOP_OBJ): $(GPDLSRC)jbig2top.c $(AK)\
$(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
$(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
- $(GPDLCC) $(I_)$(LDF_JB2I_) $(JBIG2_CFLAGS) $(II)$(JB2I_)$(_I) $(GPDLSRC)jbig2top.c $(GPDLO_)$(GPDL_JBIG2_TOP_OBJ_FILE)
+ $(GPDLJB2CC) $(GPDLSRC)jbig2top.c $(GPDLO_)$(GPDL_JBIG2_TOP_OBJ_FILE)
$(GPDL_JP2K_TOP_OBJ): $(GPDLSRC)jp2ktop.c $(AK)\
$(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\