Changeset 1279

Timestamp:

Jan 27, 2016, 7:16:26 PM (9 years ago)

Author:

Silvan Scherrer

Message:

ghostscript: adjust wrc command and default display

Location:

ghostscript/trunk/base

Files:

• unix-aux.mak (modified) (1 diff)
• unix-dll.mak (modified) (2 diffs)
• unix-gcc.mak (modified) (1 diff)

ghostscript/trunk/base/unix-aux.mak ¶

@@ -138 +138 @@
 # The "empty" $(ECHOGS_XE) lines just append a white space line to the
 # header file.
-INCLUDE=/usr/include
+INCLUDE=$(includedir)
 $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE) $(MAKEDIRS)
         $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f

ghostscript/trunk/base/unix-dll.mak ¶

@@ -114 +114 @@
 
 # os2.mak Make the icons from their text form.
+# create a includepath variable, which wrc can handle
+WRCINCLUDE=$(UNIXROOT)/usr/include
 $(PSOBJ)gsos2.ico: $(PSSRC)gsos2.icx $(ECHOGS_XE)
         $(ECHOGS_XE) -wb $(PSOBJ)gsos2.ico -n -X -r $(PSSRC)gsos2.icx
@@ -121 +123 @@
 
 $(PSOBJ)$(GS).res: $(PSSRC)$(GS).rc $(PSOBJ)gsos2.ico
-        wrc -i="$(PSSRCDIR);$(PSOBJDIR)" -r $(PSSRC)$(GS).rc -fo=$(PSOBJ)$(GS).res
+        wrc -i="$(PSSRCDIR);$(WRCINCLUDE)" -r $(PSSRC)$(GS).rc -fo=$(PSOBJ)$(GS).res
 
 # os2.mak PM driver program
 $(GLOBJ)gspmdrv.res: $(GLSRC)gspmdrv.rc $(GLSRC)gspmdrv.h $(GLOBJ)gspmdrv.ico
-        wrc -i="$(GLSRCDIR);$(GLOBJDIR)" -r $(GLSRC)gspmdrv.rc -fo=$(GLOBJ)gspmdrv.res
+        wrc -i="$(GLSRCDIR);$(WRCINCLUDE)" -r $(GLSRC)gspmdrv.rc -fo=$(GLOBJ)gspmdrv.res
 
 $(BINDIR)/gspmdrv.exe: $(GLSRC)gspmdrv.c $(GLOBJ)gspmdrv.res $(GLSRC)gspmdrv.def

ghostscript/trunk/base/unix-gcc.mak ¶

@@ -550 +550 @@
 # List of default devices, in order of priority. They need not be 
 # present in the actual build.
-GS_DEV_DEFAULT="x11alpha bbox"
+GS_DEV_DEFAULT="display bbox"
 
 # Fallback default device.  This is set to 'display' by