diff options
| author | Ken Sharp <ken.sharp@artifex.com> | 2011-01-24 17:02:11 +0000 |
|---|---|---|
| committer | Ken Sharp <ken.sharp@artifex.com> | 2011-01-24 17:02:11 +0000 |
| commit | 0be069e8af8c97cbfc55f317af4c637144f3a5c7 (patch) | |
| tree | b2edb74d0ba19adf8b3751ab423dc621d6c5a95b /main | |
| parent | 1b8624d13aea3f82f967fcc34d069ce0e317d718 (diff) | |
More changes for the display device on Windows PCL6. Fixes a minor error in the
non-Windows makefile. Makes the display device first in the list of devices on Windows.
Corrects a problem where actually selecting the display device (-sDEVICE=display) failed
to initialise the device properly.
Added the 'radix number' (eg 16#1234) as a format for integer values in the PCL
parameter processing, as the display device examples use it.
Fixed some minor long-standing compiler warnings which were suddenly being flagged as
new.
No differences expected.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12052 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'main')
| -rw-r--r-- | main/pcl6_gcc.mak | 4 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak index d08ed86f5..8cc4d7145 100644 --- a/main/pcl6_gcc.mak +++ b/main/pcl6_gcc.mak @@ -127,8 +127,8 @@ TARGET_DEVS?=$(PXLOBJDIR)/pjl.dev $(PXLOBJDIR)/pxl.dev $(PCLOBJDIR)/pcl5c.dev $( TARGET_XE?=$(GENDIR)/pcl6 TARGET_LIB?=$(GENDIR)/pcl6.a MAIN_OBJ?=$(PLOBJDIR)/plmain.$(OBJ) $(PLOBJDIR)/plimpl.$(OBJ) -REALMAIN_OBJ=$(PLOBJDIR)/realmain.$(OBJ) -REALMAIN_SRC=realmain +REALMAIN_OBJ?=$(PLOBJDIR)/realmain.$(OBJ) +REALMAIN_SRC?=realmain PCL_TOP_OBJ?=$(PCLOBJDIR)/pctop.$(OBJ) PXL_TOP_OBJ?=$(PXLOBJDIR)/pxtop.$(OBJ) TOP_OBJ?=$(PCL_TOP_OBJ) $(PXL_TOP_OBJ) diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak index ab1b44e3a..10ef7056e 100644 --- a/main/pcl6_msvc.mak +++ b/main/pcl6_msvc.mak @@ -366,8 +366,8 @@ TARGET_DEVS= $(TARGET_DEVS) $(XPSOBJDIR)/xps.dev !endif !ifndef DEVICE_DEVS -DEVICE_DEVS=$(DD)\ljet4.dev\ - $(DD)\wtsimdi.dev\ +DEVICE_DEVS=$(DD)\display.dev\ + $(DD)\ljet4.dev $(DD)\wtsimdi.dev\ $(DD)\bmpmono.dev $(DD)\bmp16m.dev $(DD)\bmp32b.dev\ $(DD)\bitcmyk.dev $(DD)\bitrgb.dev $(DD)\bit.dev\ $(DD)\pkmraw.dev $(DD)\ppmraw.dev $(DD)\pgmraw.dev $(DD)\pbmraw.dev\ @@ -381,7 +381,7 @@ DEVICE_DEVS=$(DD)\ljet4.dev\ $(DD)\tiff12nc.dev $(DD)\tiff24nc.dev $(DD)\tiffscaled.dev \ $(DD)\png16m.dev $(DD)\pngmono.dev $(DD)\jpeg.dev \ $(DD)\pdfwrite.dev $(DD)\pswrite.dev $(DD)\ps2write.dev \ - $(DD)\wtscmyk.dev $(DD)\wtsimdi.dev $(DD)\display.dev + $(DD)\wtscmyk.dev $(DD)\wtsimdi.dev !endif # GS options |