diff options
author | Henry Stiles <henry.stiles@artifex.com> | 2002-09-19 07:57:16 +0000 |
---|---|---|
committer | Henry Stiles <henry.stiles@artifex.com> | 2002-09-19 07:57:16 +0000 |
commit | 9c806fcd32e45f0f4de22a0841c70b2c2676e1aa (patch) | |
tree | 075c403d4c2fb27d190903538fe45632d353a694 /language_switch | |
parent | 117152172ec25b98d7daf370ffda894c287aa24c (diff) |
*.mak - build changes for msvc shared language build.
zfcid0.c & zfcmap.c - removes function calls that should not be used
in these modules as they depend on optional devices. This has been
fixed in the current gs tree and the relevant changes should be pulled
over.
psitop.c - msvc compiler problem, dimensioning an array with an
initialized automatic variable does not work in msvc, gcc allows it.
plplatf.c - whitespace.
plplatfps.c - gp_check_interrupts() stub. It was easier to define it
here than to unearth mslib32.dev.
git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@1733 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'language_switch')
-rw-r--r-- | language_switch/pspcl6_gcc.mak | 3 | ||||
-rw-r--r-- | language_switch/pspcl6_msvc.mak | 45 |
2 files changed, 15 insertions, 33 deletions
diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak index 8dc2249ee..2c96a711e 100644 --- a/language_switch/pspcl6_gcc.mak +++ b/language_switch/pspcl6_gcc.mak @@ -144,9 +144,6 @@ DEVICE_DEVS=$(DD)x11.dev $(DD)x11mono.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev\ $(DD)pxlmono.dev $(DD)pxlcolor.dev\ $(DD)bmpmono.dev $(DD)bmpamono.dev $(DD)pbmraw.dev $(DD)pgmraw.dev $(DD)ppmraw.dev $(DD)jpeg.dev -# GS options -# Even though FEATURE_DEVS is defined in pcl_top.mak, define identically here -# for msvc_top.mak because nmake defines macros eagerly (i.e. here & now). FEATURE_DEVS = \ $(DD)psl3.dev \ $(DD)pdf.dev \ diff --git a/language_switch/pspcl6_msvc.mak b/language_switch/pspcl6_msvc.mak index 378fc17ca..8bea1d2f3 100644 --- a/language_switch/pspcl6_msvc.mak +++ b/language_switch/pspcl6_msvc.mak @@ -37,9 +37,13 @@ JVERSION=6 # If you want to build the individual packages in their own directories, # you can define this here, although normally you won't need to do this: GLGENDIR=$(GENDIR) +ICCGENDIR=$(GENDIR) +ICCOBJDIR=$(GENDIR) PSGENDIR=$(GENDIR) PSOBJDIR=$(GENDIR) GLOBJDIR=$(GENDIR) +GLOBJ=$(GENDIR) +GLGEN=$(GENDIR) PLGENDIR=$(GENDIR) PLOBJDIR=$(GENDIR) PXLGENDIR=$(GENDIR) @@ -125,7 +129,9 @@ AGFA_INCLUDES=$(I_)$(AGFA_ROOT)\rts\inc $(I_)$(AGFA_ROOT)\sys\inc $(I_)$(AGFA_RO # We use -O0 for debugging, because optimization confuses gdb. # Note that the omission of -Dconst= rules out the use of gcc versions # between 2.7.0 and 2.7.2 inclusive. (2.7.2.1 is OK.) -PSICFLAGS=-DPSI_INCLUDED + +XCFLAGS=/DPSI_INCLUDED +PSICFLAGS=/DPSI_INCLUDED # #define xxx_BIND is in std.h # putting compile time bindings here will have the side effect of having different options @@ -143,35 +149,14 @@ DEVICE_DEVS=$(DD)\ljet4.dev $(DD)\cljet5pr.dev $(DD)\cljet5c.dev\ $(DD)\bmpmono.dev $(DD)\bmpamono.dev $(DD)\pbmraw.dev $(DD)\pgmraw.dev\ $(DD)\ppmraw.dev $(DD)\jpeg.dev -# GS options -# Even though FEATURE_DEVS is defined in pcl_top.mak, define identically here -# for msvc_top.mak because nmake defines macros eagerly (i.e. here & now). -#FEATURE_DEVS = \ -# $(DD)\psl3.dev \ -# $(DD)\pdf.dev \ -# $(DD)\dpsnext.dev \ -# $(DD)\htxlib.dev \ -# $(DD)\roplib.dev \ -# $(DD)\ttfont.dev \ -# $(DD)\pipe.dev - -FEATURE_DEVS = $(DD)\dps2lib.dev \ - $(DD)\path1lib.dev \ - $(DD)\patlib.dev \ - $(DD)\rld.dev \ - $(DD)\psl2cs.dev \ - $(DD)\roplib.dev \ - $(DD)\ttflib.dev \ - $(DD)\colimlib.dev \ - $(DD)\cielib.dev \ - $(DD)\htxlib.dev \ - $(DD)\psl3lib.dev \ - $(DD)\seprlib.dev \ - $(DD)\translib.dev \ - $(DD)\cidlib.dev \ - $(DD)\psf1lib.dev \ - $(DD)\psf0lib.dev \ - $(DD)\sdctd.dev +FEATURE_DEVS = \ + $(DD)\psl3.dev \ + $(DD)\pdf.dev \ + $(DD)\dpsnext.dev \ + $(DD)\htxlib.dev \ + $(DD)\roplib.dev \ + $(DD)\ttfont.dev \ + $(DD)\pipe.dev # Main program. |