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 | |
| 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
| -rw-r--r-- | common/msvc_top.mak | 4 | ||||
| -rw-r--r-- | main/pcl6_gcc.mak | 7 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 4 | ||||
| -rw-r--r-- | pl/pl.mak | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak index b6169d255..d7d527d77 100644 --- a/common/msvc_top.mak +++ b/common/msvc_top.mak @@ -223,7 +223,7 @@ $(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) $(L $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(GENDIR)\lib32.rsp @$(LIBCTR) @$(FONTLIB) !ELSE -$(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(GLOBJ)$(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) +$(TARGET_XE)$(XE): $(GENDIR)\ldall.tr $(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) $(LIBCTR) $(LINK_SETUP) - $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(GLOBJ)$(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(GENDIR)\lib32.rsp @$(LIBCTR) + $(LINK) $(LCT) /OUT:$(TARGET_XE)$(XE) $(REALMAIN_OBJ) $(MAIN_OBJ) $(TOP_OBJ) @$(GENDIR)\ldall.tr @$(GENDIR)\lib32.rsp @$(LIBCTR) !ENDIF 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) @@ -292,8 +292,10 @@ $(PLOBJ)plmain.$(OBJ): $(PLSRC)plmain.c $(AK) $(string__h)\ $(PLCCC) $(PLSRC)plmain.c $(PLO_)plmain.$(OBJ) # Real top level; provides main that just calls pl_main -$(PLOBJ)realmain.$(OBJ): $(PLSRC)realmain.c - $(PLCCC) $(PLSRC)realmain.c $(PLO_)realmain.$(OBJ) +# On Windows this also sets up the display device so that we +# can view the output. +$(PLOBJ)$(REALMAIN_SRC).$(OBJ): $(PLSRC)$(REALMAIN_SRC).c + $(PLATCCC) $(PLSRC)$(REALMAIN_SRC).c $(PLO_)$(REALMAIN_SRC).$(OBJ) $(PLOBJ)plimpl.$(OBJ): $(PLSRC)plimpl.c \ $(AK) \ |