diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2015-02-11 18:21:45 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2015-07-20 18:15:23 +0100 |
| commit | 4be466fb922c353e1da1da8bf93277546248c212 (patch) | |
| tree | 17ea99baf498857468bdf950b34decdb5415596f | |
| parent | c49d706c97cc916397c65c06cfa949bb1daf8440 (diff) | |
| download | ghostpdl-4be466fb922c353e1da1da8bf93277546248c212.tar.gz | |
Get the GS DLL build working, and tweak the others to cope.
| -rw-r--r-- | gs/base/gs.mak | 6 | ||||
| -rw-r--r-- | gs/pcl/pl/plwmainc.c | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/gs/base/gs.mak b/gs/base/gs.mak index 9aa7cd671..a7d7b8913 100644 --- a/gs/base/gs.mak +++ b/gs/base/gs.mak @@ -252,8 +252,8 @@ GS_MAK=$(GLSRCDIR)$(D)gs.mak # Define the names of the executables. GS_XE=$(BINDIR)$(D)$(GS)$(XE) -PCL_XE=$(BINDIR)$(D)$(PCL)$(XE) -XPS_XE=$(BINDIR)$(D)$(XPS)$(XE) +GPCL_XE=$(BINDIR)$(D)$(PCL)$(XE) +GXPS_XE=$(BINDIR)$(D)$(XPS)$(XE) AUX=$(AUXDIR)$(D) ECHOGS_XE=$(AUX)echogs$(XEAUX) @@ -273,7 +273,7 @@ gconfigd_h=$(GLGENDIR)$(D)gconfigd.h iconfxx_h=$(GLGENDIR)$(D)iconfxx.h iconfig_h=$(GLGENDIR)$(D)iconfig.h -all default : $(PCL_XE) $(PCL_XPS_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(MAKEDIRS) +all default : $(GS_XE) $(PCL_XPS_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(MAKEDIRS) $(NO_OP) # the distclean and maintainer-clean targets (if any) diff --git a/gs/pcl/pl/plwmainc.c b/gs/pcl/pl/plwmainc.c index f9243c2a7..e141396c1 100644 --- a/gs/pcl/pl/plwmainc.c +++ b/gs/pcl/pl/plwmainc.c @@ -31,6 +31,22 @@ #include "plwimg.h" #include "plapi.h" +/* FIXME: this is purely because the gsdll.h requires psi/iapi.h and + * we don't want that required here. But as a couple of Windows specific + * devices depend upon pgsdll_callback being defined, having a compatible + * set of declarations here saves having to have different device lists + * for Ghostscript and the other languages, and as both devices are + * deprecated, a simple solution seems best = for now. + */ +#ifdef __IBMC__ +#define GSPLDLLCALLLINK _System +#else +#define GSPLDLLCALLLINK +#endif + +typedef int (* GSPLDLLCALLLINK GS_PL_DLL_CALLBACK) (int, char *, unsigned long); +GS_PL_DLL_CALLBACK pgsdll_callback = NULL; + /* ------ Pseudo-errors used internally ------ */ /* Copied from gs/psi/ierrors.h */ /* |