diff options
| author | Ken Sharp <ken.sharp@artifex.com> | 2011-01-22 11:42:59 +0000 |
|---|---|---|
| committer | Ken Sharp <ken.sharp@artifex.com> | 2011-01-22 11:42:59 +0000 |
| commit | a4483007aa36a35a0f1ca07d5a2e03be93492ff8 (patch) | |
| tree | f78fc21c04f8ab3aa096e8ffacccce3b1fa6bb7e /main | |
| parent | 4131225ab089c20fe17a8b916192dd9c96bc48f4 (diff) | |
Fix the makefile changes for Windows display device on PCL6 when built on Windows. This
should now build on both Windows and non-Windows platforms.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12048 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'main')
| -rw-r--r-- | main/pcl6_gcc.mak | 7 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak index bb6bbe96b..d08ed86f5 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=$(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) @@ -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 8043f0918..ab1b44e3a 100644 --- a/main/pcl6_msvc.mak +++ b/main/pcl6_msvc.mak @@ -211,10 +211,10 @@ MAIN_OBJ=$(PLOBJDIR)\plmain.$(OBJ) $(PLOBJDIR)\plimpl.$(OBJ) $(PLOBJDIR)\dwtrace !endif !endif !ifndef REALMAIN_OBJ -REALMAIN_OBJ=dwmainc.$(OBJ) +REALMAIN_OBJ=$(PLOBJDIR)\dwmainc.$(OBJ) !endif !ifndef REALMAIN_SRC -REALMAIN_SRC=dwmainc.c +REALMAIN_SRC=dwmainc !endif !ifndef PCL_TOP_OBJ PCL_TOP_OBJ=$(PCLOBJDIR)\pctop.$(OBJ) |