Changes to the PCL interpreter makefiles so that when built on Windows the display

device is included, and selected as default, and to enable the various extras this
device needs.

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12043 a1074d23-0009-0410-80fe-cf8c14f379e6

2 files changed, 23 insertions, 10 deletions

diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index 3e2e25bc8..149cce201 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -127,7 +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_OBJ=realmain.$(OBJ)
+REALMAIN_SRC=realmain.c
 PCL_TOP_OBJ?=$(PCLOBJDIR)/pctop.$(OBJ)
 PXL_TOP_OBJ?=$(PXLOBJDIR)/pxtop.$(OBJ)
 TOP_OBJ?=$(PCL_TOP_OBJ) $(PXL_TOP_OBJ)
@@ -252,6 +253,10 @@ XOBJS?=$(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gconfig.o $(GLOBJDIR)/gscdefs.o
 # Generic makefile
 include $(COMMONDIR)/ugcc_top.mak
 
+# Windows eneds a different set of C flags, so pl.mak uses PLATCCC
+# gcc doesn't need this, so use the same set.
+PLATCCC=$(PLCCC)
+
 # Subsystems
 
 include $(PLSRCDIR)/pl.mak
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index 98ab4b86b..8043f0918 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -203,14 +203,18 @@ TARGET_XE=$(GENDIR)\pcl6
 # Main file's name
 !ifndef MAIN_OBJ
 !ifndef ALLOW_VD_TRACE
-MAIN_OBJ=$(PLOBJDIR)\plmain.$(OBJ) $(PLOBJDIR)\plimpl.$(OBJ)
+MAIN_OBJ=$(PLOBJDIR)\plmain.$(OBJ) $(PLOBJDIR)\plimpl.$(OBJ) $(PLOBJDIR)\dwimg.$(OBJ)\
+  $(PLOBJDIR)\dwreg.$(OBJ)
 !else
 MAIN_OBJ=$(PLOBJDIR)\plmain.$(OBJ) $(PLOBJDIR)\plimpl.$(OBJ) $(PLOBJDIR)\dwtrace.$(OBJ)\
  $(PLOBJDIR)\dwimg.$(OBJ) $(PLOBJDIR)\dwreg.$(OBJ)
 !endif
 !endif
 !ifndef REALMAIN_OBJ
-REALMAIN_OBJ=$(PLOBJDIR)\realmain.$(OBJ)
+REALMAIN_OBJ=dwmainc.$(OBJ)
+!endif
+!ifndef REALMAIN_SRC
+REALMAIN_SRC=dwmainc.c
 !endif
 !ifndef PCL_TOP_OBJ
 PCL_TOP_OBJ=$(PCLOBJDIR)\pctop.$(OBJ)
@@ -377,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)\wtscmyk.dev $(DD)\wtsimdi.dev $(DD)\display.dev
 !endif
 
 # GS options
@@ -432,6 +436,9 @@ config-clean: pl.config-clean pxl.config-clean
 	$(RMN_) $(PXLGENDIR)\pconf.h $(PXLGENDIR)\pconfig.h
 
 
+# Define the compilation rule for Windows interpreter code.
+PLATCCC=$(CC_WX) $(CCWINFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I)
+
 # Subsystems
 !include $(PLSRCDIR)\pl.mak
 !include $(PCLSRCDIR)\pcl.mak
@@ -449,14 +456,15 @@ $(PLOBJDIR)\dwtrace.$(OBJ): $(GLSRC)dwtrace.c $(AK)\
  $(gscdefs_h) $(stdpre_h) $(gsdll_h) $(vdtrace_h)
 	$(PLCCC_W) $(GLO_)dwtrace.$(OBJ) $(C_) $(GLSRC)dwtrace.c
 
-$(PLOBJDIR)\dwimg.obj: $(GLSRC)dwimg.c $(AK)\
- $(dwmain_h) $(dwdll_h) $(dwtext_h) $(dwimg_h) $(gdevdsp_h) $(stdio__h) \
- $(gscdefs_h) $(iapi_h) $(dwreg_h)
-	$(PLCCC_W)  $(GLO_)dwimg.obj $(C_) $(GLSRC)dwimg.c
+$(PLOBJDIR)\dwreg.obj: $(PLSRC)dwreg.c $(AK) $(dwreg_h)
+	$(PLATCCC) $(COMPILE_FOR_CONSOLE_EXE) $(GLO_)dwreg.obj $(C_) $(PLSRC)dwreg.c
+
 
-$(PLOBJDIR)\dwreg.obj: $(GLSRC)dwreg.c $(AK) $(dwreg_h)
-	$(PLCCC_W) $(GLO_)dwreg.obj $(C_) $(GLSRC)dwreg.c
+$(PLOBJDIR)\dwimg.obj: $(PLSRC)dwimg.c $(AK) $(windows__h) 
+	$(PLATCCC) $(COMPILE_FOR_CONSOLE_EXE) $(GLO_)dwimg.obj $(C_) $(PLSRC)dwimg.c
 
+$(PLOBJDIR)dwmainc.obj: $(PLSRC)dwmainc.c $(AK) $(windows__h) 
+	$(PLATCCC) $(COMPILE_FOR_CONSOLE_EXE) $(GLO_)dwmainc.obj $(C_) $(PLSRC)dwmainc.c
 
 !ifndef BSCFILE
 BSCFILE=$(GENDIR)\pcl.bsc