Changeset 654

Timestamp:

Jun 14, 2013, 11:37:54 AM (12 years ago)

Author:

Silvan Scherrer

Message:

ghostscript: applied Pauls changes and some adjustments

Location:

ghostscript/trunk

Files:

• base/gdevos2p.c (modified) (2 diffs)
• base/gp_os2.c (modified) (4 diffs)
• base/gs.mak (modified) (2 diffs)
• base/lib.mak (modified) (1 diff)
• jbig2dec/os_types.h (modified) (1 diff)
• psi/dpmain.c (modified) (2 diffs)
• psi/gsdll2.def (modified) (1 diff)
• psi/os2.mak (modified) (26 diffs)

ghostscript/trunk/base/gdevos2p.c ¶

@@ -39 +39 @@
 #define INCL_SPLDOSPRINT
 #define INCL_SPLERRORS
+#define INCL_WINERRORS
 
 #include <os2.h>
@@ -47 +48 @@
 #include "gscdefs.h"            /* for gs_product */
 
-extern HWND hwndtext;           /* in gp_os2.h */
+HWND hwndtext;
 
 typedef struct tagOS2QL {

ghostscript/trunk/base/gp_os2.c ¶

@@ -34 +34 @@
 #define pclose fclose           /* doesn't support pclose */
 #else
+#ifndef __KLIBC__
 #include <dos.h>
+#endif
 #endif
 /* Define the regs union tag for short registers. */
@@ -137 +139 @@
 gp_file_is_console(FILE * f)
 {
-#ifndef __DLL__
+#if !defined(__DLL__) && !defined(__KLIBC__)
     if (!isos2) {
         union REGS regs;
@@ -261 +263 @@
 {
 #ifndef __IBMC__
+#if defined(__KLIBC__)
+    setmode(prnfno, binary ? O_BINARY : O_TEXT);
+#else
     union REGS regs;
 
@@ -277 +282 @@
     regs.h.al = 1;              /* set device info */
     intdos(&regs, &regs);
+#endif
 #endif
 }

ghostscript/trunk/base/gs.mak ¶

@@ -375 +375 @@
  $(DEVICE_DEVS14) $(DEVICE_DEVS15) $(DEVICE_DEVS16) $(DEVICE_DEVS17) \
  $(DEVICE_DEVS18) $(DEVICE_DEVS19) $(DEVICE_DEVS20) $(DEVICE_DEVS21) \
+ $(DEVICE_DEVS22) $(DEVICE_DEVS23) $(DEVICE_DEVS24) $(DEVICE_DEVS25) \
+ $(DEVICE_DEVS26) $(DEVICE_DEVS27) $(DEVICE_DEVS28) $(DEVICE_DEVS29) \
+ $(DEVICE_DEVS30) \
  $(DEVICE_DEVS_EXTRA) $(GLD)romfs$(COMPILE_INITS).dev 
 
@@ -404 +407 @@
         $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS20)
         $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS21)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS22)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS23)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS24)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS25)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS26)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS27)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS28)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS29)
+        $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS30)
         $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS_EXTRA)
         $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(GLD)romfs$(COMPILE_INITS).dev

ghostscript/trunk/base/lib.mak ¶

@@ -39 +39 @@
 # Define the name of this makefile.
 LIB_MAK=$(GLSRC)lib.mak
+JBIG2_LIB=jbig2dec
+
 
 # Define the inter-dependencies of the .h files.

ghostscript/trunk/jbig2dec/os_types.h ¶

@@ -43 +43 @@
 #endif
 
-#if defined(HAVE_STDINT_H) || defined(__MACOS__)
+#if defined(HAVE_STDINT_H) || defined(__MACOS__) || defined(__KLIBC__)
 # include <stdint.h>
 #elif defined(__VMS)

ghostscript/trunk/psi/dpmain.c ¶

@@ -80 +80 @@
 gs_addmess(char *str)
 {
+#if defined(__EMX__)
+    fputs(str, stderr);
+    fflush(stderr);
+#else
     fputs(str, stdout);
     fflush(stdout);
+#endif
 }
 
@@ -99 +104 @@
         return TRUE;
     rc = DosFreeModule(gsdll.hmodule);
+    if (rc == 12) rc = 0; //we ignore rc == 12 (ERROR_INVALID_ACCESS)
+
     if (rc) {
         sprintf(buf, "DosFreeModule returns %d\n", rc);

ghostscript/trunk/psi/gsdll2.def ¶

@@ -3 +3 @@
 DATA MULTIPLE NONSHARED
 EXPORTS
-   gsapi_revision
-   gsapi_new_instance
-   gsapi_delete_instance
-   gsapi_init_with_args
-   gsapi_run_string_begin
-   gsapi_run_string_continue
-   gsapi_run_string_end
-   gsapi_run_string_with_length
-   gsapi_run_string
-   gsapi_run_file
-   gsapi_exit
-   gsapi_set_stdio
-   gsapi_set_poll
-   gsapi_set_display_callback
+   GSDLL_REVISION = _gsdll_revision     @1
+   GSDLL_INIT = _gsdll_init             @2
+   GSDLL_EXECUTE_BEGIN = _gsdll_execute_begin   @3
+   GSDLL_EXECUTE_CONT = _gsdll_execute_cont     @4
+   GSDLL_EXECUTE_END = _gsdll_execute_end       @5
+   GSDLL_EXIT = _gsdll_exit             @6
+   GSAPI_REVISION = _gsapi_revision
+   GSAPI_NEW_INSTANCE = _gsapi_new_instance
+   GSAPI_DELETE_INSTANCE = _gsapi_delete_instance
+   GSAPI_INIT_WITH_ARGS = _gsapi_init_with_args
+   GSAPI_RUN_STRING_BEGIN = _gsapi_run_string_begin
+   GSAPI_RUN_STRING_CONTINUE = _gsapi_run_string_continue
+   GSAPI_RUN_STRING_END = _gsapi_run_string_end
+   GSAPI_RUN_STRING_WITH_LENGTH = _gsapi_run_string_with_length
+   GSAPI_RUN_STRING = _gsapi_run_string
+   GSAPI_RUN_FILE = _gsapi_run_file
+   GSAPI_EXIT = _gsapi_exit
+   GSAPI_SET_STDIO = _gsapi_set_stdio
+   GSAPI_SET_POLL = _gsapi_set_poll
+   GSAPI_SET_DISPLAY_CALLBACK = _gsapi_set_display_callback

ghostscript/trunk/psi/os2.mak ¶

@@ -37 +37 @@
 PSGENDIR=obj
 PSOBJDIR=obj
+ADDONSDIR=addons
+CONTRIBDIR=contrib
 
 # Define the root directory for Ghostscript installation.
@@ -139 +141 @@
 # See ijs.mak for more information.
 
-#IJSSRCDIR=ijs
-#IJSEXECTYPE=win
+IJSSRCDIR=ijs
+IJSEXECTYPE=unix
 
 # Define the directory where the imdi library source is stored.
@@ -182 +184 @@
 !if $(EMX)
 COMP=gcc $(X11INCLUDE)
-COMPBASE=\emx
-EMXPATH=/emx
-COMPDIR=$(COMPBASE)\bin
-INCDIR=$(EMXPATH)/include
-LIBDIR=$(EMXPATH)/lib
+CC_SHARED=gcc
+#COMPBASE=\emx
+#EMXPATH=/emx
+#COMPDIR=$(COMPBASE)\bin
+#INCDIR=$(EMXPATH)/include
+#LIBDIR=$(EMXPATH)/lib
 CPNG=-DPNGAPI=
 !endif
@@ -208 +211 @@
 
 # EMX requires 386 or higher
-CPU_TYPE=386
+CPU_TYPE=586
 
 # Define the .dev module that implements thread and synchronization
@@ -220 +223 @@
 # Note that built-in libpng and zlib aren't available.
 
-SHARE_JPEG=0
-SHARE_LIBPNG=0
-SHARE_ZLIB=0
+SHARE_JPEG=1
+SHARE_LIBPNG=1
+SHARE_ZLIB=1
 SHARE_JBIG2=0
+SHARE_LIBTIFF=1
 
 # Swapping `make' out of memory makes linking much faster.
@@ -249 +253 @@
 #Compiler Optimiser option
 !if $(EMX)
-CO=-O
+CO=-O2
 !endif
 !if $(IBMCPP)
@@ -280 +284 @@
 _I=
 O_=-o $(NULL)
-!if $(MAKEDLL)
-OBJ=obj
-!else
 OBJ=o
-!endif
 Q=
 XE=.exe
@@ -309 +309 @@
 
 !if $(MAKEDLL)
-CONFILES=-p %%s+
+CONFILES=-p %%s
 !else
 CONFILES=
@@ -359 +359 @@
 !if $(MAKEDLL)
 !if $(EMX)
-CDLL=-Zdll -Zso -Zsys -Zomf $(MT_OPT) -D__DLL__
+CDLL=-Zomf $(MT_OPT) -D__DLL__
 !endif
 !if $(IBMCPP)
@@ -369 +369 @@
 
 !if $(EMX)
-CEXE=-Zomf
-CEXESYS=-Zomf -Zsys
-!endif
-
-GENOPT=$(CD) $(CGDB) $(CDLL) $(CO) $(CPNG)
-
-CCFLAGS0=$(GENOPT) $(PLATOPT) -D__OS2__ $(GCIFLAGS)
+CEXE=-Zexe
+CEXESYS=-Zomf -Zmap
+!endif
+
+GENOPT=$(CD) $(CGDB) $(CO) $(CPNG)
+
+CCFLAGS0=$(GENOPT) $(PLATOPT) -D__OS2__ $(GCIFLAGS) -I/cups/include
 CCFLAGS=$(CCFLAGS0) 
-CC=$(COMPDIR)\$(COMP) $(CCFLAGS0)
+CC=$(COMP) $(CCFLAGS0)
 CC_=$(CC)
 CC_D=$(CC) $(CO)
@@ -389 +389 @@
 # Since we have a large address space, we include some optional features.
 
-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(PSD)os2print.dev
+FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(PSD)os2print.dev $(PSD)jbig2.dev
 
 # Choose whether to compile the .ps initialization files into the executable.
@@ -441 +441 @@
 DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev
 DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev $(DD)epswrite.dev $(DD)txtwrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
-DEVICE_DEVS16=$(DD)bbox.dev
+DEVICE_DEVS16=$(DD)bbox.dev $(DD)cups.dev
 # Overflow for DEVS3,4,5,6,9
 DEVICE_DEVS17=$(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev 
@@ -447 +447 @@
 DEVICE_DEVS19=$(DD)lbp8.dev $(DD)m8510.dev $(DD)necp6.dev $(DD)bjc600.dev $(DD)bjc800.dev
 DEVICE_DEVS20=$(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pamcmyk32.dev
-DEVICE_DEVS21= $(DD)spotcmyk.dev $(DD)devicen.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
+DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
+# eplaser-jp devices
+DEVICE_DEVS22=$(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epson.dev $(DD)epsonc.dev $(DD)escp.dev $(DD)lp8000.dev $(DD)lq850.dev 
+DEVICE_DEVS23=$(DD)photoex.dev $(DD)st800.dev $(DD)stcolor.dev $(DD)alc1900.dev $(DD)alc2000.dev $(DD)alc4000.dev $(DD)alc4100.dev 
+DEVICE_DEVS24=$(DD)alc8500.dev $(DD)alc8600.dev $(DD)alc9100.dev $(DD)lp3000c.dev $(DD)lp8000c.dev $(DD)lp8200c.dev $(DD)lp8300c.dev 
+DEVICE_DEVS25=$(DD)lp8500c.dev $(DD)lp8800c.dev $(DD)lp9000c.dev $(DD)lp9200c.dev $(DD)lp9500c.dev $(DD)lp9800c.dev $(DD)lps6500.dev 
+DEVICE_DEVS26=$(DD)epl2050.dev $(DD)epl2050p.dev $(DD)epl2120.dev $(DD)epl2500.dev $(DD)epl2750.dev $(DD)epl5800.dev $(DD)epl5900.dev
+DEVICE_DEVS27=$(DD)epl6100.dev $(DD)epl6200.dev $(DD)lp1800.dev $(DD)lp1900.dev $(DD)lp2200.dev $(DD)lp2400.dev $(DD)lp2500.dev 
+DEVICE_DEVS28=$(DD)lp7500.dev $(DD)lp7700.dev $(DD)lp7900.dev $(DD)lp8100.dev $(DD)lp8300f.dev $(DD)lp8400f.dev $(DD)lp8600.dev 
+DEVICE_DEVS29=$(DD)lp8600f.dev $(DD)lp8700.dev $(DD)lp8900.dev $(DD)lp9000b.dev $(DD)lp9100.dev $(DD)lp9200b.dev $(DD)lp9300.dev
+DEVICE_DEVS30=$(DD)lp9400.dev $(DD)lp9600.dev $(DD)lp9600s.dev $(DD)lps4500.dev $(DD)eplcolor.dev $(DD)eplmono.dev
 
 # Include the generic makefiles.
@@ -461 +471 @@
 !include "$(GLSRCDIR)\jbig2.mak"
 !include "$(GLSRCDIR)\icclib.mak"
+!include "$(GLSRCDIR)\ijs.mak"
 !include "$(GLSRCDIR)\devs.mak"
+!include "$(GLSRCDIR)\libtiff.mak"
 !include "$(GLSRCDIR)\pcwin.mak"
 !include "$(GLSRCDIR)\contrib.mak"
+!include "contrib\contrib.mak"
 !include "$(PSSRCDIR)\int.mak"
+!include "cups/cups.mak"
 
 # -------------------------------- Library -------------------------------- #
@@ -508 +522 @@
 #CCAUX=$(COMPDIR)\$(COMP) $(CO)
 # emx 0.9d (gcc 2.8.1) crashes when compiling genarch.c with optimizer
-CCAUX=$(COMPDIR)\$(COMP)
+CCAUX=$(COMP)
 
 $(ECHOGS_XE): $(GLSRCDIR)\echogs.c
 !if $(EMX)
-        $(CCAUX) -o $(AUXGEN)echogs $(GLSRCDIR)\echogs.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)echogs $(ECHOGS_XE)
-        del $(AUXGEN)echogs
+        $(CCAUX) -o $(AUXGEN)echogs$(XEAUX) $(GLSRCDIR)\echogs.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)echogs $(ECHOGS_XE)
+#       del $(AUXGEN)echogs
 !endif
 !if $(IBMCPP)
@@ -524 +538 @@
         -mkdir $(BINDIR)
 !if $(EMX)
-        $(CCAUX) -DHAVE_LONG_LONG -o $(AUXGEN)genarch $(GLSRCDIR)\genarch.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genarch $(GENARCH_XE)
-        del $(AUXGEN)genarch
+        $(CCAUX) -DHAVE_LONG_LONG -Zomf -o $(AUXGEN)genarch$(XEAUX) $(GLSRCDIR)\genarch.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genarch $(GENARCH_XE)
+#       del $(AUXGEN)genarch
 !endif
 !if $(IBMCPP)
@@ -534 +548 @@
 $(GENCONF_XE): $(GLSRCDIR)\genconf.c $(GENCONF_DEPS)
 !if $(EMX)
-        $(CCAUX) -o $(AUXGEN)genconf $(GLSRCDIR)\genconf.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genconf $(GENCONF_XE)
-        del $(AUXGEN)genconf
+        $(CCAUX) -o $(AUXGEN)genconf$(XEAUX) $(GLSRCDIR)\genconf.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genconf $(GENCONF_XE)
+#       del $(AUXGEN)genconf
 !endif
 !if $(IBMCPP)
@@ -544 +558 @@
 $(GENDEV_XE): $(GLSRCDIR)\gendev.c $(GENDEV_DEPS)
 !if $(EMX)
-        $(CCAUX) -o $(AUXGEN)gendev $(GLSRCDIR)\gendev.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)gendev $(GENDEV_XE)
-        del $(AUXGEN)gendev
+        $(CCAUX) -o $(AUXGEN)gendev$(XEAUX) $(GLSRCDIR)\gendev.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)gendev $(GENDEV_XE)
+#       del $(AUXGEN)gendev
 !endif
 !if $(IBMCPP)
@@ -554 +568 @@
 $(GENHT_XE): $(PSSRC)genht.c $(GENHT_DEPS)
 !if $(EMX)
-        $(CCAUX) -o $(AUXGEN)genht $(GENHT_CFLAGS) $(PSSRC)genht.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genht $(GENHT_XE)
-        del $(AUXGEN)genht
+        $(CCAUX) -o $(AUXGEN)genht$(XEAUX) $(GENHT_CFLAGS) $(PSSRC)genht.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genht $(GENHT_XE)
+#       del $(AUXGEN)genht
 !endif
 !if $(IBMCPP)
@@ -564 +578 @@
 $(GENINIT_XE): $(PSSRC)geninit.c $(GENINIT_DEPS)
 !if $(EMX)
-        $(CCAUX) -o $(AUXGEN)geninit $(PSSRC)geninit.c
-        $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)geninit $(GENINIT_XE)
-        del $(AUXGEN)geninit
+        $(CCAUX) -o $(AUXGEN)geninit$(XEAUX) $(PSSRC)geninit.c
+#       $(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)geninit $(GENINIT_XE)
+#       del $(AUXGEN)geninit
 !endif
 !if $(IBMCPP)
@@ -572 +586 @@
 !endif
 
-MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gp_getnv.obj $(GLOBJ)gp_os2fs.obj
+MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
+ $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) \
+ $(GLOBJ)gp_getnv.$(OBJ) $(GLOBJ)gp_os2.$(OBJ) $(GLOBJ)gp_os2fs.$(OBJ) $(GLOBJ)gp_stdia.$(OBJ) \
+ $(GLOBJ)gsutil.$(OBJ) 
+
 $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
 !if $(EMX)
@@ -583 +601 @@
 # No special gconfig_.h is needed.
 $(gconfig__h): $(TOP_MAKEFILES) $(ECHOGS_XE)
-        $(ECHOGS_XE) -w $(gconfig__h) /* This file deliberately left blank. */
+        $(ECHOGS_XE) -w $(gconfig__h) /* This file is created by os2.mak. */
+        $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H
+        $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_STDINT_H
 
 # ----------------------------- Main program ------------------------------ #
+
+gsdllos2_h=$(GLSRC)gsdllos2.h
 
 # Interpreter main program
@@ -597 +619 @@
 !if $(MAKEDLL)
 #making a DLL
-GS_ALL=$(INT_ALL) \
+GS_ALL=$(PSOBJ)gsdll.$(OBJ) $(INT_ALL) \
   $(LIB_ALL) $(LIBCTR) $(ld_tr) $(PSOBJ)$(GS).res $(ICONS) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
 
 $(GS_XE): $(BINDIR)\$(GSDLL).dll $(PSSRC)dpmain.c $(PSSRC)gsos2.rc $(GLOBJ)gscdefs.$(OBJ)
 !if $(EMX)
-        $(COMPDIR)\$(COMP) $(CGDB) $(CO) -Zomf $(MT_OPT) -I$(PSSRCDIR) -I$(GLSRCDIR) -I$(PSOBJDIR) -I$(GLOBJDIR) -o$(GS_XE) $(PSSRC)dpmain.c $(GLOBJ)gscdefs.$(OBJ) $(PSSRC)gsos2.def
+        $(CCAUX) $(CGDB) $(CO) -Zomf $(CDLL) $(MT_OPT) -I$(PSSRCDIR) -I$(GLSRCDIR) -I$(PSOBJDIR) -I$(GLOBJDIR) -o $(GS_XE) $(PSSRC)dpmain.c $(GLOBJ)gscdefs.$(OBJ) $(PSSRC)gsos2.def
 !endif
 !if $(IBMCPP)
         $(CCAUX) -I$(PSSRCDIR) -I$(GLSRCDIR) -I$(PSOBJDIR) -I$(GLOBJDIR) /Fe$(GX_XE) $(PSSRC)dpmain.c $(GLOBJ)gscdefs.$(OBJ)
 !endif
-        rc $(PSOBJ)$(GS).res $(GS_XE)
-
-$(BINDIR)\$(GSDLL).dll: $(GS_ALL) $(ALL_DEVS) 
-!if $(EMX)
-        LINK386 /DEBUG $(COMPBASE)\lib\dll0.obj $(COMPBASE)\lib\end.lib @$(ld_tr) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ), $(BINDIR)\$(GSDLL).dll, ,$(X11LIBS) $(COMPBASE)\lib\gcc.lib $(COMPBASE)\lib\st\c.lib $(COMPBASE)\lib\st\c_dllso.lib $(COMPBASE)\lib\st\sys.lib $(COMPBASE)\lib\c_alias.lib $(COMPBASE)\lib\os2.lib, $(PSSRC)gsdll2.def
+        wrc $(PSOBJ)$(GS).res $(GS_XE)
+
+$(PSOBJ)gsdll.$(OBJ): $(PSSRC)gsdll.c $(gsdll_h) $(ghost_h) $(gscdefs_h)
+        $(PSCC) $(PSO_)gsdll.$(OBJ) $(C_) $(PSSRC)gsdll.c
+
+$(BINDIR)\$(GSDLL).dll: $(GS_ALL) $(ALL_DEVS) $(PSOBJ)gsdll.$(OBJ)
+!if $(EMX)
+        gcc -Zdll -Zomf -Zmap -o $(BINDIR)\$(GSDLL).dll $(PSSRC)gsdll2.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gsdll.o @$(ld_tr) -ltiff -ljpeg -lpng -lz -lcups -lcupsimage -lpthread
 !endif
 !if $(IBMCPP)
@@ -623 +648 @@
 
 $(GS_XE): $(GS_ALL) $(ALL_DEVS)
-        $(COMPDIR)\$(COMP) $(CGDB) I$(PSSRCDIR) -I$(GLSRCDIR) -o $(PSOBJ)$(GS) $(PSOBJ)gs.$(OBJ) @$(ld_tr) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) -lm
-        $(COMPDIR)\emxbind -r$(PSOBJ)$(GS).res $(COMPDIR)\emxl.exe $(PSOBJ)$(GS) $(GS_XE) -ac
-        del $(PSOBJ)$(GS)
+        $(CCAUX) $(CGDB) I$(PSSRCDIR) -I$(GLSRCDIR) -Zomf -Zbin-files -o $(PSOBJ)$(GS) $(PSOBJ)gs.$(OBJ) @$(ld_tr) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) -lm
+#       $(COMPDIR)\emxbind -r$(PSOBJ)$(GS).res $(COMPDIR)\emxl.exe $(PSOBJ)$(GS) $(GS_XE) -ac
+#       del $(PSOBJ)$(GS)
 !endif
 
@@ -637 +662 @@
 
 $(PSOBJ)$(GS).res: $(PSSRC)$(GS).rc $(PSOBJ)gsos2.ico
-        rc -i $(COMPBASE)\include -i $(PSSRCDIR) -i $(PSOBJDIR) -r $(PSSRC)$(GS).rc $(PSOBJ)$(GS).res
+        wrc -i=$(PSSRCDIR);$(PSOBJDIR) -r $(PSSRC)$(GS).rc -fo=$(PSOBJ)$(GS).res
 
 
@@ -643 +668 @@
 
 $(GLOBJ)gspmdrv.o: $(GLSRC)gspmdrv.c $(GLSRC)gspmdrv.h
-        $(COMPDIR)\$(COMP) $(CGDB) $(CO) -I$(GLSRCDIR) -o $(GLOBJ)gspmdrv.o -c $(GLSRC)gspmdrv.c
+        $(CCAUX) $(CGDB) $(CO) -I$(GLSRCDIR) -o $(GLOBJ)gspmdrv.o -c $(GLSRC)gspmdrv.c
 
 $(GLOBJ)gspmdrv.res: $(GLSRC)gspmdrv.rc $(GLSRC)gspmdrv.h $(GLOBJ)gspmdrv.ico
-        rc -i $(COMPBASE)\include -i $(GLSRCDIR) -i $(GLOBJDIR) -r $(GLSRC)gspmdrv.rc $(GLOBJ)gspmdrv.res
+        wrc -i=$(GLSRCDIR);$(GLOBJDIR) -r $(GLSRC)gspmdrv.rc -fo=$(GLOBJ)gspmdrv.res
 
 $(BINDIR)\gspmdrv.exe: $(GLOBJ)gspmdrv.o $(GLOBJ)gspmdrv.res $(GLSRC)gspmdrv.def
-        $(COMPDIR)\$(COMP) $(CGDB) $(CO) -o $(GLOBJ)gspmdrv $(GLOBJ)gspmdrv.o 
-        $(COMPDIR)\emxbind -p -r$(GLOBJ)gspmdrv.res -d$(GLSRC)gspmdrv.def $(COMPDIR)\emxl.exe $(GLOBJ)gspmdrv $(BINDIR)\gspmdrv.exe
-        del $(GLOBJ)gspmdrv
+        $(CCAUX) $(CGDB) $(CO) -o $(BINDIR)\gspmdrv.exe $(GLOBJ)gspmdrv.o 
+#       $(COMPDIR)\emxbind -p -r$(GLOBJ)gspmdrv.res -d$(GLSRC)gspmdrv.def $(COMPDIR)\emxl.exe $(GLOBJ)gspmdrv $(BINDIR)\gspmdrv.exe
+#       del $(GLOBJ)gspmdrv
 
 # Create a ZIP archive