[gs-commits] rev 11750 - trunk/gs/base

ray at ghostscript.com ray at ghostscript.com
Fri Oct 1 19:36:07 UTC 2010


Author: ray
Date: 2010-10-01 19:36:06 +0000 (Fri, 01 Oct 2010)
New Revision: 11750

Removed:
   trunk/gs/base/bcwin32.mak
   trunk/gs/base/gp_iwatc.c
   trunk/gs/base/watclib.mak
   trunk/gs/base/watcw32.mak
   trunk/gs/base/wccommon.mak
   trunk/gs/base/wctail.mak
Log:
Drop support for these less popular compilers. This will be the first step to
changing to project files for Windows.


Deleted: trunk/gs/base/bcwin32.mak
===================================================================
--- trunk/gs/base/bcwin32.mak	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/bcwin32.mak	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,717 +0,0 @@
-#  Copyright (C) 2001-2007 Artifex Software, Inc.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# makefile for (Windows 95 / Windows NT) +
-#   Borland C++ 4.5 and 5.5 platforms.
-#   Borland C++Builder 3 platform (need BC++ 4.5 for 16-bit code)
-
-# ------------------------------- Options ------------------------------- #
-
-###### This section is the only part of the file you should need to edit.
-
-# ------ Generic options ------ #
-
-# Define the directory for the final executable, and the
-# source, generated intermediate file, and object directories
-# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
-
-!ifndef BINDIR
-BINDIR=.\bin
-!endif
-!ifndef GLSRCDIR
-GLSRCDIR=.\base
-!endif
-!ifndef GLGENDIR
-GLGENDIR=.\obj
-!endif
-!ifndef GLOBJDIR
-GLOBJDIR=.\obj
-!endif
-!ifndef PSSRCDIR
-PSSRCDIR=.\psi
-!endif
-!ifndef PSLIBDIR
-PSLIBDIR=.\lib
-!endif
-!ifndef PSRESDIR
-PSRESDIR=.\Resource
-!endif
-!ifndef PSGENDIR
-PSGENDIR=.\obj
-!endif
-!ifndef PSOBJDIR
-PSOBJDIR=.\obj
-!endif
-
-# Define the root directory for Ghostscript installation.
-
-!ifndef AROOTDIR
-AROOTDIR=c:/gs
-!endif
-!ifndef GSROOTDIR
-GSROOTDIR=$(AROOTDIR)/gs$(GS_DOT_VERSION)
-!endif
-
-# Define the directory that will hold documentation at runtime.
-
-!ifndef GS_DOCDIR
-GS_DOCDIR=$(GSROOTDIR)/doc
-!endif
-
-# Define the default directory/ies for the runtime
-# initialization, resource and font files.  Separate multiple directories with \;.
-# Use / to indicate directories, not a single \.
-
-!ifndef GS_LIB_DEFAULT
-GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Init\;$(GSROOTDIR)/lib\;$(GSROOTDIR)/Resource/Font\;$(AROOTDIR)/fonts
-!endif
-
-# Define whether or not searching for initialization files should always
-# look in the current directory first.  This leads to well-known security
-# and confusion problems, but may be convenient sometimes.
-
-!ifndef SEARCH_HERE_FIRST
-SEARCH_HERE_FIRST=0
-!endif
-
-# Define the name of the interpreter initialization file.
-# (There is no reason to change this.)
-
-!ifndef GS_INIT
-GS_INIT=gs_init.ps
-!endif
-
-# Choose generic configuration options.
-
-# Setting DEBUG=1 includes debugging features in the build:
-# 1. It defines the C preprocessor symbol DEBUG. The latter includes
-#    tracing and self-validation code fragments into compilation.
-#    Particularly it enables the -Z and -T switches in Ghostscript.
-# Code produced with this option is somewhat larger and runs 
-# somewhat slower.
-
-!ifndef DEBUG
-DEBUG=0
-!endif
-
-# Setting TDEBUG=1 includes symbol table information for the debugger, and
-# also enables stack checking.  The compiled code is substantially slower
-# and larger.
-
-!ifndef TDEBUG
-TDEBUG=0
-!endif
-
-# Define the names of the executable files.
-
-!ifndef GS
-GS=gswin32
-!endif
-!ifndef GSCONSOLE
-GSCONSOLE=gswin32c
-!endif
-!ifndef GSDLL
-GSDLL=gsdll32
-!endif
-
-# To build two small executables and a large DLL use MAKEDLL=1
-# To build two large executables use MAKEDLL=0
-
-!ifndef MAKEDLL
-MAKEDLL=1
-!endif
-
-# Define the directory where the IJG JPEG library sources are stored,
-# and the major version of the library that is stored there.
-# You may need to change this if the IJG library version changes.
-# See jpeg.mak for more information.
-
-!ifndef JSRCDIR
-JSRCDIR=jpeg
-!endif
-
-# Define the directory where the PNG library sources are stored,
-# and the version of the library that is stored there.
-# You may need to change this if the libpng version changes.
-# See libpng.mak for more information.
-
-!ifndef PNGSRCDIR
-PNGSRCDIR=libpng
-!endif
-
-!ifndef TIFFSRCDIR
-TIFFSRCDIR=tiff$(D)
-TIFFCONFIG_SUFFIX=.vc
-TIFFPLATFORM=win32
-!endif
-
-# Define the directory where the zlib sources are stored.
-# See zlib.mak for more information.
-
-!ifndef ZSRCDIR
-ZSRCDIR=zlib
-!endif
-
-# Define which jbig2 library to use
-!ifndef JBIG2_LIB
-JBIG2_LIB=jbig2dec
-!endif
-
-!if "$(JBIG2_LIB)" == "luratech" || "$(JBIG2_LIB)" == "ldf_jb2"
-# Set defaults for using the Luratech JB2 implementation
-!ifndef JBIG2SRCDIR
-# CSDK source code location
-JBIG2SRCDIR=ldf_jb2
-!endif
-!ifndef JBIG2_CFLAGS
-# required compiler flags
-JBIG2_CFLAGS=-DUSE_LDF_JB2 -DWIN32
-!endif
-!else
-# Use jbig2dec by default. See jbig2.mak for more information.
-!ifndef JBIG2SRCDIR
-# location of included jbig2dec library source
-JBIG2SRCDIR=jbig2dec
-!endif
-!endif
-
-# Alternatively, you can build a separate DLL
-# and define SHARE_JBIG2=1 in src/winlib.mak
-
-# Define which jpeg2k library to use
-!ifndef JPX_LIB
-JPX_LIB=jasper
-!endif
-
-!if "$(JPX_LIB)" == "luratech" || "$(JPX_LIB)" == "lwf_jp2"
-# Set defaults for using the Luratech JP2 implementation
-!ifndef JPXSRCDIR
-# CSDK source code location
-JPXSRCDIR=lwf_jp2
-!endif
-!ifndef JPX_CFLAGS
-# required compiler flags
-JPX_CFLAGS=-DUSE_LWF_JP2 -DWIN32
-!endif
-!else
-# Use jasper by default. See jasper.mak for more information.
-!ifndef JPXSRCDIR
-JPXSRCDIR=jasper
-!endif
-!endif
-
-# Alternatively, you can build a separate DLL
-# and define SHARE_JPX=1 in src/winlib.mak
-
-# Define the directory where the lcms source is stored.
-# See lcms.mak for more information
-
-!ifndef LCMSSRCDIR
-LCMSSRCDIR=lcms
-!endif
-
-# Define the directory where the ijs source is stored,
-# and the process forking method to use for the server.
-# See ijs.mak for more information.
-
-!ifndef IJSSRCDIR
-IJSSRCDIR=ijs
-IJSEXECTYPE=win
-!endif
-
-# Define the directory where the imdi library source is stored.
-# See devs.mak for more information
-
-!ifndef IMDISRCDIR
-IMDISRCDIR=imdi
-!endif
-
-# Define any other compilation flags.
-
-!ifndef CFLAGS
-CFLAGS=
-!endif
-
-# Do not edit the next group of lines.
-
-#!include $(COMMONDIR)\bcdefs.mak
-#!include $(COMMONDIR)\pcdefs.mak
-#!include $(COMMONDIR)\generic.mak
-!include $(GLSRCDIR)\version.mak
-# The following is a hack to get around the special treatment of \ at
-# the end of a line.
-NUL=
-DD=$(GLGENDIR)\$(NUL)
-GLD=$(GLGENDIR)\$(NUL)
-PSD=$(PSGENDIR)\$(NUL)
-
-# ------ Platform-specific options ------ #
-
-# Define the drive, directory, and compiler name for the Borland C files.
-# BUILDER_VERSION=0 for BC++4.5, 3 for C++Builder3, 4 for C++Builder4,
-#  5 for C++Builder5.
-# COMPDIR contains the compiler and linker (normally \bc\bin).
-# INCDIR contains the include files (normally \bc\include).
-# LIBDIR contains the library files (normally \bc\lib).
-# COMP is the full C compiler name (bcc32 for Borland C++).
-# COMPCPP is the full C++ compiler path name (bcc32 for Borland C++).
-# COMPAUX is the compiler name for DOS utilities (bcc for Borland C++).
-# RCOMP is the resource compiler name (brcc32 for Borland C++).
-# LINK is the full linker path name (normally \bc\bin\tlink32).
-# Note that these prefixes are always followed by a \,
-#   so if you want to use the current directory, use an explicit '.'.
-
-# Rod Webster (rodw)
-# If C++Builder is later than 4 then you need to 
-# define BUILDER_VERSION explicity uisng BUILDER_VERSION=5 because 
-# C++Builder 4 and above all use Make Version 5.2 so point we can no 
-# longer tell the Compiler version from the __MAKE__ version number.
-
-!ifndef BUILDER_VERSION
-BUILDER_VERSION=5
-!endif
-
-!ifndef BUILDER_VERSION
-!if $(__MAKE__) >= 0x520
-# C++Builder4
-BUILDER_VERSION=4
-!elif $(__MAKE__) >= 0x510
-# C++Builder3
-BUILDER_VERSION=3
-!else
-# BC++4.5
-BUILDER_VERSION=0
-!endif
-!endif
-
-!ifndef COMPBASE
-!if $(BUILDER_VERSION) == 0
-COMPBASE=c:\bc
-COMPBASE16=$(COMPBASE)
-!endif
-!if $(BUILDER_VERSION) == 3
-COMPBASE=c:\Progra~1\Borland\CBuilder3
-COMPBASE16=c:\bc
-!endif
-!if $(BUILDER_VERSION) == 4
-COMPBASE=c:\Progra~1\Borland\CBuilder4
-COMPBASE16=c:\bc
-!endif
-!if $(BUILDER_VERSION) == 5
-COMPBASE=c:\Borland\BCC55
-#COMPBASE16=$(COMPBASE)
-!endif
-!endif
-
-COMPDIR=$(COMPBASE)\bin
-INCDIR=$(COMPBASE)\include
-LIBDIR=$(COMPBASE)\lib
-COMP=$(COMPDIR)\bcc32
-COMPCPP=$(COMP)
-RCOMP=$(COMPDIR)\brcc32
-
-!if $(BUILDER_VERSION) == 0
-COMPAUX=$(COMPDIR)\bcc
-!else
-COMPAUX=$(COMPDIR)\bcc32
-!endif
-
-!if $(BUILDER_VERSION) == 4
-LINK=$(COMPDIR)\ilink32
-!endif
-!if $(BUILDER_VERSION) == 5
-LINK=$(COMPDIR)\ilink32
-!endif
-
-# Define the processor architecture. (always i386)
-
-CPU_FAMILY=i386
-
-# Define the processor (CPU) type.  (386, 486 or 586)
-
-CPU_TYPE=586
-
-# Define the .dev module that implements thread and synchronization
-# primitives for this platform.  Don't change this unless you really know
-# what you're doing.
-
-!ifndef SYNC
-SYNC=winsync
-!endif
-
-# ------ Devices and features ------ #
-
-# Choose the language feature(s) to include.  See gs.mak for details.
-
-!ifndef FEATURE_DEVS
-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(PSD)mshandle.dev $(PSD)msprinter.dev $(PSD)mspoll.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev
-!endif
-
-# Choose whether to compile the .ps initialization files into the executable.
-# See gs.mak for details.
-
-!ifndef COMPILE_INITS
-COMPILE_INITS=1
-!endif
-
-# Choose whether to store band lists on files or in memory.
-# The choices are 'file' or 'memory'.
-
-!ifndef BAND_LIST_STORAGE
-BAND_LIST_STORAGE=file
-!endif
-
-# Choose which compression method to use when storing band lists in memory.
-# The choices are 'lzw' or 'zlib'.
-
-!ifndef BAND_LIST_COMPRESSOR
-BAND_LIST_COMPRESSOR=zlib
-!endif
-
-# Choose the implementation of file I/O: 'stdio', 'fd', or 'both'.
-# See gs.mak and sfxfd.c for more details.
-
-!ifndef FILE_IMPLEMENTATION
-FILE_IMPLEMENTATION=stdio
-!endif
-
-# Choose the implementation of stdio: '' for file I/O and 'c' for callouts
-# See gs.mak and ziodevs.c/ziodevsc.c for more details.
-
-!ifndef STDIO_IMPLEMENTATION
-STDIO_IMPLEMENTATION=c
-!endif
-
-# Choose the device(s) to include.  See devs.mak for details,
-# devs.mak and contrib.mak for the list of available devices.
-
-!ifndef DEVICE_DEVS
-DEVICE_DEVS=$(DD)display.dev $(DD)mswindll.dev $(DD)mswinpr2.dev
-DEVICE_DEVS2=$(DD)epson.dev $(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epsonc.dev $(DD)ibmpro.dev
-DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev
-DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev
-DEVICE_DEVS5=$(DD)uniprint.dev $(DD)djet500c.dev $(DD)declj250.dev $(DD)lj250.dev $(DD)ijs.dev
-DEVICE_DEVS6=$(DD)st800.dev $(DD)stcolor.dev $(DD)bj10e.dev $(DD)bj200.dev
-DEVICE_DEVS7=$(DD)t4693d2.dev $(DD)t4693d4.dev $(DD)t4693d8.dev $(DD)tek4696.dev
-DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
-DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pkmraw.dev
-DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
-DEVICE_DEVS11=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiffsep.dev $(DD)tiffsep1.dev
-DEVICE_DEVS12=$(DD)psmono.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
-DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev
-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
-# Overflow for DEVS3,4,5,6,9
-DEVICE_DEVS17=$(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev 
-DEVICE_DEVS18=$(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev $(DD)jetp3852.dev $(DD)r4081.dev
-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
-!endif
-
-# FAPI compilation options :
-UFST_CFLAGS=-DMSVC
-
-# ---------------------------- End of options ---------------------------- #
-
-# Define the name of the makefile -- used in dependencies.
-
-MAKEFILE=$(GLSRCDIR)\bcwin32.mak
-TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\winlib.mak $(PSSRCDIR)\winint.mak
-
-# Define the current directory prefix and shell invocations.
-
-D=\\
-
-EXP=
-SH=
-
-# Define the arguments for genconf.
-
-CONFILES=-p %s+
-CONFLDTR=-ol
-
-# Define the generic compilation flags.
-
-PLATOPT=
-
-# Make sure we get the right default target for make.
-
-dosdefault: default
-
-# Define the switches for the compilers.
-
-C_=-c
-O_=-o
-RO_=-fo
-
-# Define the compilation flags.
-
-!if $(CPU_TYPE)>500
-CPFLAGS=-DFOR80486 -DFOR80386
-!else if $(CPU_TYPE)>400
-CPFLAGS=-DFOR80486 -DFOR80386
-!else
-CPFLAGS=-DFOR80386
-!endif
-
-FPFLAGS=
-FPLIB=
-
-!if $(DEBUG)!=0
-CD=-DDEBUG
-!else
-CD=
-!endif
-
-!if $(TDEBUG)!=0
-CT=-v
-LCT=-v -m -s
-CO=    # no optimization when debugging
-!else
-CT=
-LCT=
-CO=-Z -O2
-!endif
-
-!if $(DEBUG)!=0 || $(TDEBUG)!=0
-CS=-N
-!else
-CS=
-!endif
-
-CMT=-tWM
-CLIB=cw32mt.lib
-
-# Specify function prolog type
-COMPILE_FOR_DLL=-WDE
-COMPILE_FOR_EXE=-WE
-COMPILE_FOR_CONSOLE_EXE=-WC
-
-# The -tWM is for multi-thread-safe compilation.
-GENOPT=$(CD) $(CT) $(CS) $(CMT)
-
-CCFLAGS0=$(GENOPT) $(PLATOPT) $(CPFLAGS) $(FPFLAGS) $(CFLAGS) $(XCFLAGS)
-CCFLAGS=$(CCFLAGS0)
-CC=$(COMP) @$(GLGENDIR)\ccf32.tr
-CPP=$(COMPCPP) @$(GLGENDIR)\ccf32.tr
-!if $(MAKEDLL)
-WX=$(COMPILE_FOR_DLL)
-!else
-WX=$(COMPILE_FOR_EXE)
-!endif
-CC_WX=$(CC) $(WX)
-CC_=$(CC_WX) $(CO)
-CC_NO_WARN=$(CC_)
-
-# No additional flags are needed for Windows compilation.
-CCWINFLAGS=
-
-# Define the files to be removed by `make clean'.
-# nmake expands macros when encountered, not when used,
-# so this must precede the !include statements.
-
-# ****** HACK ****** *.tr is still created in the current directory.
-BEGINFILES2=*.tr
-
-# Include the generic makefiles. psromfs.mak must precede lib.mak
-
-!include $(PSSRCDIR)\psromfs.mak
-!include $(GLSRCDIR)\winlib.mak
-!include $(PSSRCDIR)\winint.mak
-
-# -------------------------- Auxiliary programs --------------------------- #
-
-# Compiler for auxiliary programs
-
-!if $(BUILDER_VERSION) == 0
-CCAUX=$(COMPAUX) -ml -I$(GLSRCDIR) -I$(INCDIR) -L$(LIBDIR) -n$(AUXGENDIR) -O
-!else
-CCAUX=$(COMPAUX) -I$(GLSRCDIR) -I$(INCDIR) -L$(LIBDIR) -n$(AUXGENDIR) -O
-!endif
-CCAUX_TAIL=
-
-$(GLGENDIR)\ccf32.tr: $(TOP_MAKEFILES)
-	-mkdir $(PSOBJDIR)
-	-mkdir $(PSGENDIR)
-	-mkdir $(GLOBJDIR)
-	-mkdir $(GLGENDIR)
-	-mkdir $(BINDIR)
-	echo -a1 -d -r -w-par -w-stu -G -N -X -I$(INCDIR) > $(GLGENDIR)\ccf32.tr
-	echo $(CCFLAGS0) -DCHECK_INTERRUPTS >> $(GLGENDIR)\ccf32.tr
-
-$(ECHOGS_XE): $(GLSRCDIR)\echogs.c
-	$(CCAUX) $(GLSRCDIR)\echogs.c $(CCAUX_TAIL)
-
-# Since we are running in a Windows environment with a different compiler
-# for the DOS utilities, we have to invoke genarch by hand.
-# For unfathomable reasons, the 'win' program requires /, not \,
-# in the name of the program to be run, and apparently also in any
-# file names passed on the command line (?!).
-$(GENARCH_XE): $(GLSRCDIR)\genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr
-	$(COMP) -I$(GLSRCDIR) -I$(INCDIR) -L$(LIBDIR) -n$(AUXGENDIR) -O $(GLSRCDIR)\genarch.c
-	echo win $(AUXGENDIR)/genarch $(GLGENDIR)/arch.h >_genarch.bat
-	echo ***** Run "_genarch.bat", then continue make. *****
-
-$(GENCONF_XE): $(GLSRCDIR)\genconf.c $(GENCONF_DEPS)
-	$(CCAUX) $(GLSRCDIR)\genconf.c $(CCAUX_TAIL)
-
-$(GENDEV_XE): $(GLSRCDIR)\gendev.c $(GENDEV_DEPS)
-	$(CCAUX) $(GLSRCDIR)\gendev.c $(CCAUX_TAIL)
-
-$(GENHT_XE): $(PSSRCDIR)\genht.c $(GENHT_DEPS)
-	$(CCAUX) $(GENHT_CFLAGS) $(PSSRCDIR)\genht.c $(CCAUX_TAIL)
-
-MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(winplat_) $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ)
-$(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
-	$(COMPAUX) -I$(GLSRCDIR) -I$(INCDIR) -L$(LIBDIR)  -I$(GLOBJ) -I$(ZSRCDIR) @$(GLGENDIR)\ccf32.tr -e$(MKROMFS_XE) $(GLSRC)mkromfs.c $(MKROMFS_OBJS) $(CCAUX_TAIL)
-
-# ----------------------------- Main program ------------------------------ #
-
-LIBCTR=$(PSGEN)libc32.tr
-GSCONSOLE_XE=$(BINDIR)\$(GSCONSOLE).exe
-GSDLL_DLL=$(BINDIR)\$(GSDLL).dll
-
-$(LIBCTR): $(TOP_MAKEFILES) $(ECHOGS_XE)
-	echo $(LIBDIR)\import32.lib $(LIBDIR)\$(CLIB) >$(LIBCTR)
-
-!if $(BUILDER_VERSION) == 0
-# Borland C++ 4.5 will not compile the setup program,
-# since a later Windows header file is required.
-SETUP_TARGETS=
-!else
-SETUP_TARGETS=$(SETUP_XE) $(UNINSTALL_XE)
-!endif
-
-!if $(MAKEDLL)
-# The graphical small EXE loader
-$(GS_XE): $(GSDLL_DLL)  $(DWOBJ) $(GSCONSOLE_XE)\
- $(GS_OBJ).res $(PSSRCDIR)\dwmain32.def $(SETUP_TARGETS)
-	$(LINK) /L$(LIBDIR) /Tpe /aa $(LCT) @&&!
-$(LIBDIR)\c0w32 +
-$(DWOBJ) +
-,$(GS_XE),$(PSOBJ)$(GS), +
-$(LIBDIR)\import32 +
-$(LIBDIR)\cw32, +
-$(PSSRCDIR)\dwmain32.def, +
-$(GS_OBJ).res
-!
-
-# The console mode small EXE loader
-!if $(BUILDER_VERSION) == 5
-$(GSCONSOLE_XE): $(OBJC) $(GS_OBJ).res $(PSSRCDIR)\dw32c.def
-	$(LINK) /L$(LIBDIR) /Tpe /ap $(LCT) $(DEBUGLINK) @&&!
-$(LIBDIR)\c0x32 +
-$(OBJC) +
-,$(GSCONSOLE_XE),$(PSOBJ)$(GSCONSOLE), +
-$(LIBDIR)\import32 +
-$(LIBDIR)\cw32mt, +
-$(PSSRCDIR)\dw32c.def, +
-$(GS_OBJ).res
-!
-!else
-
-$(GSCONSOLE_XE): $(OBJC) $(GS_OBJ).res $(PSSRCDIR)\dw32c.def
-	$(LINK) /L$(LIBDIR) /Tpe /ap $(LCT) $(DEBUGLINK) @&&!
-$(LIBDIR)\c0w32 +
-$(OBJC) +
-,$(GSCONSOLE_XE),$(PSOBJ)$(GSCONSOLE), +
-$(LIBDIR)\import32 +
-$(LIBDIR)\cw32, +
-$(PSSRCDIR)\dw32c.def, +
-$(GS_OBJ).res
-!
-!endif
-
-# The big DLL
-$(GSDLL_DLL): $(GS_ALL) $(DEVS_ALL) $(PSOBJ)gsdll.$(OBJ)\
- $(GSDLL_OBJ).res $(PSSRCDIR)\gsdll32.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	-del $(PSGEN)gswin32.tr
-	copy $(ld_tr) $(PSGEN)gswin32.tr
-	echo  $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) + >> $(PSGEN)gswin32.tr
-	echo $(LIBDIR)\c0d32 $(PSOBJ)gsdll + >> $(PSGEN)gswin32.tr
-	$(LINK) /L$(LIBDIR) $(LCT) /Tpd /aa @$(PSGEN)gswin32.tr ,$(GSDLL_DLL),$(PSOBJ)$(GSDLL),@$(LIBCTR),$(PSSRCDIR)\gsdll32.def,$(GSDLL_OBJ).res
-
-# Probably no need to build the def - hence commented out for the time being.
-$(BINDIR)\$(GSDLL).lib : $(GSDLL_DLL) $(PSSRCDIR)\gsdll32.def
-	#impdef $(PSSRCDIR)\gsdll32.def $(GSDLL_DLL)
-	implib $(BINDIR)\$(GSDLL).lib $(PSSRCDIR)\gsdll32.def
-
-!else
-# The big graphical EXE
-$(GS_XE):   $(GSCONSOLE_XE) $(GS_ALL) $(DEVS_ALL)\
- $(PSOBJ)gsdll.$(OBJ) $(DWOBJNO) $(GS_OBJ).res $(PSSRCDIR)\dwmain32.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	-del $(PSGEN)gswin32.tr
-	copy $(ld_tr) $(PSGEN)gswin32.tr
-	echo  $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) + >> $(PSGEN)gswin32.tr
-	echo $(LIBDIR)\c0w32 $(PSOBJ)gsdll + >> $(PSGEN)gswin32.tr
-	echo $(DWOBJNO) >> $(PSGEN)gswin32.tr
-	$(LINK) /L$(LIBDIR) $(LCT) /Tpe /aa @$(PSGEN)gswin32.tr ,$(GS_XE),$(PSOBJ)$(GS) @$(LIBCTR),$(PSSRCDIR)\dwmain32.def,$(GS_OBJ).res
-
-# The big console mode EXE
-$(GSCONSOLE_XE):  $(GS_ALL) $(DEVS_ALL)\
- $(PSOBJ)gsdll.$(OBJ) $(OBJCNO) $(GS_OBJ).res $(PSSRCDIR)\dw32c.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	-del $(PSGEN)gswin32.tr
-	copy $(ld_tr) $(PSGEN)gswin32.tr
-	echo  $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) + >> $(PSGEN)gswin32.tr
-	echo $(LIBDIR)\c0w32 $(PSOBJ)gsdll + >> $(PSGEN)gswin32.tr
-	echo $(OBJCNO) >> $(PSGEN)gswin32.tr
-	$(LINK) /L$(LIBDIR) $(LCT) /Tpe /ap @$(PSGEN)gswin32.tr ,$(GSCONSOLE_XE),$(PSOBJ)$(GSCONSOLE) @$(LIBCTR),$(PSSRCDIR)\dw32c.def,$(GS_OBJ).res
-!endif
-
-
-# ---------------------- Setup and uninstall programs ---------------------- #
-
-$(MAKE_FILELIST_XE): $(PSSRC)mkfilelt.cpp
-	$(COMPAUX) -I$(GLSRCDIR) -I$(INCDIR) -L$(LIBDIR) -L$(LIBDIR)\PSDK -W -O -e$(MAKE_FILELIST_XE) $(PSSRC)mkfilelt.cpp $(CCAUX_TAIL)
-
-!if $(MAKEDLL)
-
-$(SETUP_XE): $(PSOBJ)dwsetup.obj $(PSOBJ)dwinst.obj $(PSOBJ)dwsetup.res $(PSSRC)dwsetup.def
-	$(LINK) /Tpe /aa $(LCT) $(DEBUGLINK) -L$(LIBDIR) @&&!
-$(LIBDIR)\c0w32 +
-$(PSOBJ)dwsetup.obj $(PSOBJ)dwinst.obj +
-,$(SETUP_XE),$(PSOBJ)dwsetup, +
-$(LIBDIR)\import32 +
-$(LIBDIR)\ole2w32 +
-$(LIBDIR)\cw32, +
-$(PSSRCDIR)\dwsetup.def, +
-$(PSOBJ)dwsetup.res
-!
-
-$(UNINSTALL_XE): $(PSOBJ)dwuninst.obj $(PSOBJ)dwuninst.res $(PSSRC)dwuninst.def
-	$(LINK) /Tpe /aa $(LCT) $(DEBUGLINK) -L$(LIBDIR) @&&!
-$(LIBDIR)\c0w32 +
-$(PSOBJ)dwuninst.obj +
-,$(UNINSTALL_XE),$(PSOBJ)dwuninst, +
-$(LIBDIR)\import32 +
-$(LIBDIR)\ole2w32 +
-$(LIBDIR)\cw32, +
-$(PSSRCDIR)\dwuninst.def, +
-$(PSOBJ)dwuninst.res
-!
-
-
-!endif
-
-DEBUGDEFS=BINDIR=.\debugbin GLGENDIR=.\debugobj GLOBJDIR=.\debugobj PSLIBDIR=.\lib PSGENDIR=.\debugobj PSOBJDIR=.\debugobj DEBUG=1 TDEBUG=1
-OTHERDEFS=COMPBASE="$(COMPBASE)" AROOTDIR="$(AROOTDIR)" GSROOTDIR="$(GSROOTDIR)" CFLAGS="$(CFLAGS)"
-
-debug:
-	make -f $(MAKEFILE) $(DEBUGDEFS) $(OTHERDEFS)
-
-debugclean:
-	make -f $(MAKEFILE) $(DEBUGDEFS) clean
-
-# end of makefile

Deleted: trunk/gs/base/gp_iwatc.c
===================================================================
--- trunk/gs/base/gp_iwatc.c	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/gp_iwatc.c	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,240 +0,0 @@
-/* Copyright (C) 2001-2006 Artifex Software, Inc.
-   All Rights Reserved.
-  
-   This software is provided AS-IS with no warranty, either express or
-   implied.
-
-   This software is distributed under license and may not be copied, modified
-   or distributed except as expressly authorized under the terms of that
-   license.  Refer to licensing information at http://www.artifex.com/
-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-*/
-
-/* $Id$ */
-/* Intel processor, Watcom C-specific routines for Ghostscript */
-#include "dos_.h"
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include "stat_.h"
-#include "string_.h"
-#include "gx.h"
-#include "gp.h"
-#include "gpmisc.h"
-
-/* Library routines not declared in a standard header */
-extern char *mktemp(char *);	/* in gp_mktmp.c */
-
-/* Define a substitute for stdprn (see below). */
-static FILE *gs_stdprn;
-
-/* Forward declarations */
-static void handle_FPE(int);
-
-/* Do platform-dependent initialization. */
-void
-gp_init(void)
-{
-    gs_stdprn = 0;
-    /* Set up the handler for numeric exceptions. */
-    signal(SIGFPE, handle_FPE);
-}
-
-/* Trap numeric exceptions.  Someday we will do something */
-/* more appropriate with these. */
-static void
-handle_FPE(int sig)
-{
-    eprintf("Numeric exception:\n");
-    exit(1);
-}
-
-/* Do platform-dependent cleanup. */
-void
-gp_exit(int exit_status, int code)
-{
-}
-
-/* Exit the program. */
-void
-gp_do_exit(int exit_status)
-{
-    exit(exit_status);
-}
-
-/* ------ Persistent data cache ------*/
-  
-/* insert a buffer under a (type, key) pair */
-int gp_cache_insert(int type, byte *key, int keylen, void *buffer, int buflen)
-{ 
-    /* not yet implemented */
-    return 0;
-} 
- 
-/* look up a (type, key) in the cache */
-int gp_cache_query(int type, byte* key, int keylen, void **buffer,
-    gp_cache_alloc alloc, void *userdata)
-{
-    /* not yet implemented */
-    return -1;
-}
-
-/* ------ Printer accessing ------ */
-
-/* Open a connection to a printer.  A null file name means use the */
-/* standard printer connected to the machine, if any. */
-/* Return NULL if the connection could not be opened. */
-extern void gp_set_file_binary(int, int);
-FILE *
-gp_open_printer(const gs_memory_t *mem,
-                      char         fname[gp_file_name_sizeof],
-                      int          binary_mode)
-{
-    FILE *pfile;
-
-    if (strlen(fname) == 0 || !strcmp(fname, "PRN")) {
-#ifdef stdprn
-	if (!binary_mode)
-	    return stdprn;
-	if (gs_stdprn == 0) {
-	    /* We have to effectively reopen the printer, */
-	    /* because the Watcom library does \n -> \r\n */
-	    /* substitution on the stdprn stream. */
-	    int fno = dup(fileno(stdprn));
-
-	    setmode(fno, O_BINARY);
-	    gs_stdprn = fdopen(fno, "wb");
-	}
-	pfile = gs_stdprn;
-#else	/* WATCOM doesn't know about stdprn device */
-	pfile = fopen("PRN", (binary_mode ? "wb" : "w"));
-	if (pfile == NULL)
-	    return NULL;
-#endif	/* defined(stdprn) */
-    } else {
-	pfile = fopen(fname, (binary_mode ? "wb" : "w"));
-	if (pfile == NULL)
-	    return NULL;
-    }
-    gp_set_file_binary(fileno(pfile), binary_mode);
-    return pfile;
-}
-
-/* Close the connection to the printer. */
-void
-gp_close_printer(const gs_memory_t *mem, FILE * pfile, const char *fname)
-{
-#ifdef stdprn
-    if (pfile != stdprn)
-#endif	/* defined(stdprn) */
-	fclose(pfile);
-    if (pfile == gs_stdprn)
-	gs_stdprn = 0;
-}
-
-/* ------ File naming and accessing ------ */
-
-/* Create and open a scratch file with a given name prefix. */
-/* Write the actual file name at fname. */
-FILE *
-gp_open_scratch_file(const gs_memory_t *mem,
-                     const char        *prefix,
-                     char              *fname,
-                     const char        *mode)
-{	      /* The -7 is for XXXXXXX */
-    int prefix_length = strlen(prefix);
-    int len = gp_file_name_sizeof - prefix_length - 7;
-    FILE *f;
-
-    if (gp_file_name_is_absolute(prefix, prefix_length) ||
-	gp_gettmpdir(fname, &len) != 0
-	)
-	*fname = 0;
-    else {
-	char *temp;
-
-	/* Prevent X's in path from being converted by mktemp. */
-	for (temp = fname; *temp; temp++)
-	    *temp = tolower(*temp);
-	if (strlen(fname) && (fname[strlen(fname) - 1] != '\\'))
-	    strcat(fname, "\\");
-    }
-    if (strlen(fname) + prefix_length + 7 >= gp_file_name_sizeof)
-	return 0;		/* file name too long */
-    strcat(fname, prefix);
-    strcat(fname, "XXXXXX");
-    mktemp(fname);
-    f = gp_fopentemp(fname, mode);
-    if (f == NULL)
-	emprintf1(mem, "**** Could not open temporary file %s\n", fname);
-    return f;
-}
-
-
-/* Open a file with the given name, as a stream of uninterpreted bytes. */
-FILE *
-gp_fopen(const char *fname, const char *mode)
-{
-    return fopen(fname, mode);
-}
-
-/* ------ Font enumeration ------ */
- 
- /* This is used to query the native os for a list of font names and
-  * corresponding paths. The general idea is to save the hassle of
-  * building a custom fontmap file.
-  */
- 
-void *gp_enumerate_fonts_init(gs_memory_t *mem)
-{
-    return NULL;
-}
-         
-int gp_enumerate_fonts_next(void *enum_state, char **fontname, char **path)
-{
-    return 0;
-}
-                         
-void gp_enumerate_fonts_free(void *enum_state)
-{
-}  
-
-/* --------- 64 bit file access ----------- */
-/* fixme: Not implemented yet.
- * Currently we stub it with 32 bits access. 
- */
-
-FILE *gp_fopen_64(const char *filename, const char *mode)
-{
-    return fopen(filename, mode);
-}
-
-FILE *gp_open_scratch_file_64(const gs_memory_t *mem,
-                              const char        *prefix,
-                              char               fname[gp_file_name_sizeof],
-                              const char        *mode)
-{
-    return gp_open_scratch_file(mem, prefix, fname, mode);
-}
-
-FILE *gp_open_printer_64(const gs_memory_t *mem,
-                               char         fname[gp_file_name_sizeof],
-                               int          binary_mode)
-{
-    return gp_open_printer(mem, fname, binary_mode);
-}
-
-int64_t gp_ftell_64(FILE *strm)
-{
-    return ftell(strm);
-}
-
-int gp_fseek_64(FILE *strm, int64_t offset, int origin)
-{
-    long offset1 = (long)offset;
-    
-    if (offset != offset1)
-	return -1;
-    return fseek(strm, offset1, origin);
-}

Deleted: trunk/gs/base/watclib.mak
===================================================================
--- trunk/gs/base/watclib.mak	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/watclib.mak	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,189 +0,0 @@
-#  Copyright (C) 2001-2006 Artifex Software, Inc.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# makefile for MS-DOS / Watcom C/C++ library testing.
-
-libdefault: $(GLOBJ)gslib.exe
-	$(NO_OP)
-
-AROOTDIR=c:/gs
-GSROOTDIR=$(AROOTDIR)/gs$(GS_DOT_VERSION)
-GS_DOCDIR=$(GSROOTDIR)/doc
-GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Init\;$(GSROOTDIR)/lib\;$(GSROOTDIR)/Resource/Font\;$(AROOTDIR)/fonts
-SEARCH_HERE_FIRST=0
-GS_INIT=gs_init.ps
-
-!ifndef DEBUG
-DEBUG=1
-!endif
-!ifndef TDEBUG
-TDEBUG=1
-!endif
-
-GS=gslib
-
-!ifndef BINDIR
-BINDIR=.\debugobj
-!endif
-!ifndef GLSRCDIR
-GLSRCDIR=.\base
-!endif
-!ifndef PSRESDIR
-PSRESDIR=.\Resource
-!endif
-!ifndef GLGENDIR
-GLGENDIR=.\debugobj
-!endif
-!ifndef GLOBJDIR
-GLOBJDIR=.\debugobj
-!endif
-
-# Do not edit the next group of lines.
-NUL=
-DD=$(GLGENDIR)\$(NUL)
-GLD=$(GLGENDIR)\$(NUL)
-
-!ifndef JSRCDIR
-JSRCDIR=jpeg
-!endif
-
-!ifndef PNGSRCDIR
-PNGSRCDIR=libpng
-!endif
-
-!ifndef ZSRCDIR
-ZSRCDIR=zlib
-!endif
-
-# Define the jbig2dec library and source location.
-# See jbig2.mak for more information.
-
-!ifndef JBIG2_LIB
-JBIG2_LIB=jbig2dec
-!endif
-
-!ifndef JBIG2SRCDIR
-JBIG2SRCDIR=jbig2dec
-!endif
-
-# Define the directory where the lcms source is stored.
-# See lcms.mak for more information
-
-!ifndef LCMSSRCDIR
-LCMSSRCDIR=lcms
-!endif
-
-# Define the directory where the ijs source is stored,
-# and the process forking method to use for the server.
-# See ijs.mak for more information.
-
-!ifndef IJSSRCDIR
-IJSSRCDIR=ijs
-IJSEXECTYPE=win
-!endif
-
-# Define the directory where the imdi library source is stored.
-# See devs.mak for more information
-
-!ifndef IMDISRCDIR
-IMDISRCDIR=imdi
-!endif
-
-CFLAGS=
-
-!ifndef WCVERSION
-WCVERSION=10.0
-!endif
-LIBPATHS=LIBPATH $(%WATCOM)\lib386 LIBPATH $(%WATCOM)\lib386\dos
-STUB=$(%WATCOM)\binb\wstub.exe
-
-!ifndef CPU_TYPE
-CPU_TYPE=386
-!endif
-
-!ifndef SYNC
-SYNC=winsync
-!endif
-
-PLATFORM=watclib_
-MAKEFILE=$(GLSRCDIR)\watclib.mak
-TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak
-PLATOPT=
-
-!include $(GLSRCDIR)\wccommon.mak
-
-!ifndef FEATURE_DEVS
-FEATURE_DEVS=$(GLD)patlib.dev $(GLD)path1lib.dev
-!endif
-!ifndef DEVICE_DEVS
-DEVICE_DEVS=$(DD)vga.dev
-!endif
-
-!ifndef COMPILE_INITS
-COMPILE_INITS=0
-!endif
-!ifndef BAND_LIST_STORAGE
-BAND_LIST_STORAGE=file
-!endif
-!ifndef BAND_LIST_COMPRESSOR
-BAND_LIST_COMPRESSOR=zlib
-!endif
-!ifndef FILE_IMPLEMENTATION
-FILE_IMPLEMENTATION=stdio
-!endif
-!ifndef STDIO_IMPLEMENTATION
-STDIO_IMPLEMENTATION=
-!endif
-
-!include $(GLSRCDIR)\wctail.mak
-!include $(GLSRCDIR)\devs.mak
-!include $(GLSRCDIR)\contrib.mak
-
-GLCCWIN=$(GLCC)
-!include $(GLSRCDIR)\winplat.mak
-
-watclib_1=$(GLOBJ)gp_getnv.$(OBJ) $(GLOBJ)gp_paper.$(OBJ) $(GLOBJ)gp_iwatc.$(OBJ)
-!ifeq WAT32 0
-watclib_2=$(GLOBJ)gp_dosfs.$(OBJ) $(GLOBJ)gp_dosfe.$(OBJ) $(GLOBJ)gp_msdos.$(OBJ)
-watclib_inc=
-!else
-watclib_2=
-watclib_inc=$(GLD)winplat.dev
-!endif
-watclib__=$(watclib_1) $(watclib_2)
-$(GLGEN)watclib_.dev: $(watclib__) $(GLGEN)nosync.dev $(watclib_inc)
-	$(SETMOD) $(GLGEN)watclib_ $(watclib_1)
-	$(ADDMOD) $(GLGEN)watclib_ -obj $(watclib_2)
-	$(ADDMOD) $(GLGEN)watclib_ -include $(GLGEN)nosync $(watclib_inc)
-
-$(GLOBJ)gp_iwatc.$(OBJ): $(GLSRC)gp_iwatc.c $(stat__h) $(string__h)\
- $(gx_h) $(gp_h) $(gpmisc_h)
-	$(GLCC) $(GLO_)gp_iwatc.$(OBJ) $(C_) $(GLSRC)gp_iwatc.c
-
-BEGINFILES=*.err
-
-LIB_ONLY=$(GLOBJ)gslib.obj $(GLOBJ)gsnogc.obj $(GLOBJ)gconfig.obj $(GLOBJ)gscdefs.obj $(GLOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-ll_tr=ll.tr
-$(ll_tr): $(TOP_MAKEFILES)
-	echo OPTION STACK=64k >$(ll_tr)
-!ifeq WAT32 0
-	echo SYSTEM DOS4G >>$(ll_tr)
-	echo OPTION STUB=$(STUB) >>$(ll_tr)
-!endif
-	echo FILE $(GLOBJ)gsromfs$(COMPILE_INITS).$(OBJ) >>$(ll_tr)
-	echo FILE $(GLOBJ)gsnogc.obj >>$(ll_tr)
-	echo FILE $(GLOBJ)gconfig.obj >>$(ll_tr)
-	echo FILE $(GLOBJ)gscdefs.obj >>$(ll_tr)
-
-$(GLOBJ)gslib.exe: $(LIB_ALL) $(LIB_ONLY) $(ld_tr) $(ll_tr)
-	$(LINK) $(LCT) NAME gslib OPTION MAP=gslib FILE $(GLOBJ)gslib @$(ld_tr) @$(ll_tr)

Deleted: trunk/gs/base/watcw32.mak
===================================================================
--- trunk/gs/base/watcw32.mak	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/watcw32.mak	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,484 +0,0 @@
-#  Copyright (C) 2001-2007 Artifex Software, Inc.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# watcw32.mak
-# makefile for Watcom C++ v??, Windows NT or Windows 95 platform.
-# Created 1997-02-23 by Russell Lang from MSVC++ 4.0 makefile.
-# Major revisions 1999-07-26 by Ray Johnston.
-
-# ------------------------------- Options ------------------------------- #
-
-###### This section is the only part of the file you should need to edit.
-
-# ------ Generic options ------ #
-
-# Define the directory for the final executable, and the
-# source, generated intermediate file, and object directories
-# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
-
-BINDIR=bin
-GLSRCDIR=base
-GLGENDIR=obj
-GLOBJDIR=obj
-PSSRCDIR=psi
-PSLIBDIR=lib
-PSRESDIR=Resource
-PSGENDIR=obj
-PSOBJDIR=obj
-
-# Define the root directory for Ghostscript installation.
-
-AROOTDIR=c:/gs
-GSROOTDIR=$(AROOTDIR)/gs$(GS_DOT_VERSION)
-
-# Define the directory that will hold documentation at runtime.
-
-GS_DOCDIR=$(GSROOTDIR)/doc
-
-# Define the default directory/ies for the runtime
-# initialization, resource and font files.  Separate multiple directories with \;.
-# Use / to indicate directories, not a single \.
-
-GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Init\;$(GSROOTDIR)/lib\;$(GSROOTDIR)/Resource/Font\;$(AROOTDIR)/fonts
-
-# Define whether or not searching for initialization files should always
-# look in the current directory first.  This leads to well-known security
-# and confusion problems, but users insist on it.
-
-SEARCH_HERE_FIRST=0
-
-# Define the name of the interpreter initialization file.
-# (There is no reason to change this.)
-
-GS_INIT=gs_init.ps
-
-# Choose generic configuration options.
-
-# Setting DEBUG=1 includes debugging features (-Z switch) in the code.
-# Code runs substantially slower even if no debugging switches are set,
-# and also takes about another 25K of memory.
-
-DEBUG=0
-
-# Setting TDEBUG=1 includes symbol table information for the debugger,
-# and also enables stack checking.  Code is substantially slower and larger.
-
-TDEBUG=0
-
-# Define the name of the executable file.
-
-GS=gswin32
-GSCONSOLE=gswin32c
-GSDLL=gsdll32
-
-# To build two small executables and a large DLL use MAKEDLL=1
-# To build two large executables use MAKEDLL=0
-
-MAKEDLL=1
-
-# Define the directory where the IJG JPEG library sources are stored,
-# and the major version of the library that is stored there.
-# You may need to change this if the IJG library version changes.
-# See jpeg.mak for more information.
-
-JSRCDIR=jpeg
-
-# Define the directory where the PNG library sources are stored,
-# and the version of the library that is stored there.
-# You may need to change this if the libpng version changes.
-# See libpng.mak for more information.
-
-PNGSRCDIR=libpng
-
-# Define the directory where the zlib sources are stored.
-# See zlib.mak for more information.
-
-ZSRCDIR=zlib
-
-# Define the jbig2dec library source location.
-# See jbig2.mak for more information.
-
-!ifndef JBIG2_LIB
-JBIG2_LIB=jbig2dec
-!endif
-
-!ifndef JBIG2SRCDIR
-JBIG2SRCDIR=jbig2dec
-!endif
-
-# Define the directory where the lcms source is stored.
-# See lcms.mak for more information
-
-!ifndef LCMSSRCDIR
-LCMSSRCDIR=lcms
-!endif
-
-# Define the directory where the ijs source is stored,
-# and the process forking method to use for the server.
-# See ijs.mak for more information.
-
-IJSSRCDIR=ijs
-IJSEXECTYPE=win
-
-# Define the directory where the imdi source are stored.
-# See imdi.mak for more information
-
-!ifndef IMDISRCDIR
-IMDISRCDIR=imdi
-!endif
-
-# Define any other compilation flags.
-
-CFLAGS=
-
-# ------ Platform-specific options ------ #
-
-# Define the drive, directory, and compiler name for the Watcom C files.
-# COMPDIR contains the compiler and linker.
-# INCDIR contains the include files.
-# LIBDIR contains the library files.
-# COMP is the full C compiler path name.
-# COMPCPP is the full C++ compiler path name.
-# COMPAUX is the compiler name for DOS utilities.
-# RCOMP is the resource compiler name.
-# LINK is the full linker path name.
-# Note that INCDIR and LIBDIR are always followed by a \,
-#   so if you want to use the current directory, use an explicit '.'.
-
-COMPBASE=$(%WATCOM)
-COMPDIR=$(COMPBASE)\binnt
-INCDIR=$(COMPBASE)\h -i$(COMPBASE)\h\nt
-LIBDIR=$(COMPBASE)\lib386;$(COMPBASE)\lib386\nt
-COMP=$(COMPDIR)\wcc386
-COMPCPP=$(COMPDIR)\wpp386
-COMPAUX=$(COMPDIR)\wcc386
-RCOMP=$(COMPDIR)\wrc
-LINK=$(COMPDIR)\wlink
-
-# Define the processor architecture. (always i386)
-CPU_FAMILY=i386
-
-# Define the processor (CPU) type.  (386, 486 or 586)
-CPU_TYPE=486
-
-# Define the math coprocessor (FPU) type.
-# Options are -1 (optimize for no FPU), 0 (optimize for FPU present,
-# but do not require a FPU), 87, 287, or 387.
-# If you have a 486 or Pentium CPU, you should normally set FPU_TYPE to 387,
-# since most of these CPUs include the equivalent of an 80387 on-chip;
-# however, the 486SX and the Cyrix 486SLC do not have an on-chip FPU, so if
-# you have one of these CPUs and no external FPU, set FPU_TYPE to -1 or 0.
-# An xx87 option means that the executable will run only if a FPU
-# of that type (or higher) is available: this is NOT currently checked
-# at runtime.
-
-FPU_TYPE=387
-
-# Define the .dev module that implements thread and synchronization
-# primitives for this platform.  Don't change this unless you really know
-# what you're doing.
-
-SYNC=winsync
-
-# Do not edit the next group of lines.
-NUL=
-DD=$(GLGENDIR)\$(NUL)
-GLD=$(GLGENDIR)\$(NUL)
-PSD=$(PSGENDIR)\$(NUL)
-
-# ------ Devices and features ------ #
-
-# Choose the language feature(s) to include.  See gs.mak for details.
-
-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev
-
-# Choose whether to compile the .ps initialization files into the executable.
-# See gs.mak for details.
-
-COMPILE_INITS=0
-
-# Choose whether to store band lists on files or in memory.
-# The choices are 'file' or 'memory'.
-
-BAND_LIST_STORAGE=file
-
-# Choose which compression method to use when storing band lists in memory.
-# The choices are 'lzw' or 'zlib'.
-
-BAND_LIST_COMPRESSOR=zlib
-
-# Choose the implementation of file I/O: 'stdio', 'fd', or 'both'.
-# See gs.mak and sfxfd.c for more details.
-
-FILE_IMPLEMENTATION=stdio
-
-# Choose the implementation of stdio: '' for file I/O and 'c' for callouts
-# See gs.mak and ziodevs.c/ziodevsc.c for more details.
-
-STDIO_IMPLEMENTATION=c
-
-# Choose the device(s) to include.  See devs.mak for details,
-# devs.mak and contrib.mak for the list of available devices.
-
-DEVICE_DEVS=$(DD)display.dev $(DD)mswindll.dev $(DD)mswinpr2.dev
-DEVICE_DEVS2=$(DD)epson.dev $(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epsonc.dev $(DD)ibmpro.dev
-DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev
-DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev
-DEVICE_DEVS5=$(DD)djet500c.dev $(DD)declj250.dev $(DD)lj250.dev $(DD)jetp3852.dev $(DD)r4081.dev $(DD)lbp8.dev $(DD)uniprint.dev
-DEVICE_DEVS6=$(DD)st800.dev $(DD)stcolor.dev $(DD)bj10e.dev $(DD)bj200.dev $(DD)m8510.dev $(DD)necp6.dev $(DD)bjc600.dev $(DD)bjc800.dev
-DEVICE_DEVS7=$(DD)t4693d2.dev $(DD)t4693d4.dev $(DD)t4693d8.dev $(DD)tek4696.dev
-DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev
-DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pamcmyk32.dev
-DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
-DEVICE_DEVS11=$(DD)bmpmono.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiffsep.dev $(DD)tiffsep1.dev
-DEVICE_DEVS12=$(DD)psmono.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev
-DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev
-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
-# Overflow for DEVS3,4,5,6,9
-DEVICE_DEVS16=$(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev
-DEVICE_DEVS17=$(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
-DEVICE_DEVS18=
-DEVICE_DEVS19=
-DEVICE_DEVS20=
-
-# ---------------------------- End of options ---------------------------- #
-
-# Define the name of the makefile -- used in dependencies.
-
-MAKEFILE=$(PSSRCDIR)\watcw32.mak
-TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\winlib.mak $(PSSRCDIR)\winint.mak
-
-# Define the executable and shell invocations.
-
-D=\\
-
-EXP=
-SH=
-
-# Define the arguments for genconf.
-
-CONFILES=-e ~ -p FILE~s~ps
-CONFLDTR=-o
-
-# Define the generic compilation flags.
-
-PLATOPT=
-
-# Make sure we get the right default target for make.
-
-dosdefault: default
-
-# Define the compilation flags.
-
-!ifeq CPU_TYPE 586
-CPFLAGS=-5s
-!else
-!ifeq CPU_TYPE 486
-CPFLAGS=-4s
-!else
-!ifeq CPU_TYPE 386
-CPFLAGS=-3s
-!else
-CPFLAGS=
-!endif
-!endif
-!endif
-
-!ifeq FPU_TYPE 586
-FPFLAGS=-fp5
-!else
-!ifeq FPU_TYPE 486
-FPFLAGS=-fp4
-!else
-!ifeq FPU_TYPE 386
-FPFLAGS=-fp3
-!else
-FPFLAGS=
-!endif
-!endif
-!endif
-
-
-!ifneq DEBUG 0
-CD=-dDEBUG
-!else
-CD=
-!endif
-
-!ifneq TDEBUG 0
-# What options should WATCOM use for $(CT) when debugging?
-CT=-d2
-LCT=DEBUG ALL
-COMPILE_FULL_OPTIMIZED=    # no optimization when debugging
-COMPILE_WITH_FRAMES=    # no optimization when debugging
-COMPILE_WITHOUT_FRAMES=    # no optimization when debugging
-!else
-CT=-d1
-LCT=DEBUG LINES
-COMPILE_FULL_OPTIMIZED=-oilmre -s
-COMPILE_WITH_FRAMES=-of+
-COMPILE_WITHOUT_FRAMES=-s
-!endif
-
-!ifneq DEBUG 0
-CS=
-!else
-CS=-s
-!endif
-
-# Specify function prolog type
-COMPILE_FOR_DLL=-bd
-COMPILE_FOR_EXE=
-COMPILE_FOR_CONSOLE_EXE=
-
-GENOPT=-d+ $(CD) $(CT) $(CS) -zq -zp8
-
-CCFLAGS=$(PLATOPT) $(FPFLAGS) $(CPFLAGS) $(CFLAGS) $(XCFLAGS)
-CC=$(COMP) $(CCFLAGS) @$(GLGENDIR)\ccf32.tr
-CPP=$(COMPCPP) $(CCFLAGS) @$(GLGENDIR)\ccf32.tr
-!ifneq MAKEDLL 0
-WX=$(COMPILE_FOR_DLL)
-!else
-WX=$(COMPILE_FOR_EXE)
-!endif
-CC_WX=$(CC) $(WX)
-CC_=$(CC_WX) $(COMPILE_FULL_OPTIMIZED)
-CC_NO_WARN=$(CC_)
-CC_SHARED=$(CC_)
-
-# No additional flags are needed for Windows compilation.
-CCWINFLAGS=
-
-# Compiler for auxiliary programs
-
-CCAUX=$(COMPAUX) -I$(INCDIR) -otexan
-
-# Define the files to be removed by `make clean'.
-# nmake expands macros when encountered, not when used,
-# so this must precede the !include statements.
-
-BEGINFILES2=gsdll32.rex gswin32.rex gswin32c.rex
-
-# Define the switches for the compilers.
-
-C_=
-O_=-fo=
-RO_=$(O_)
-
-# Include the generic makefiles.
-
-!include $(GLSRCDIR)\version.mak
-# psromfs.mak must precede lib.mak
-!include $(PSSRCDIR)\psromfs.mak
-!include $(GLSRCDIR)\winlib.mak
-!include $(PSSRCDIR)\winint.mak
-
-# -------------------------- Auxiliary programs --------------------------- #
-
-$(GLGENDIR)\ccf32.tr: $(TOP_MAKEFILES)
-	echo $(GENOPT) -I$(INCDIR) -DCHECK_INTERRUPTS -D_Windows -D__WIN32__ -D_WATCOM_ > $(GLGENDIR)\ccf32.tr
-
-$(ECHOGS_XE): $(GLSRC)echogs.c
-	$(CCAUX) $(GLSRC)echogs.c $(O_)$(GLOBJ)echogs.obj 
-	$(LINK) FILE $(GLOBJ)echogs.obj NAME $(ECHOGS_XE)
-
-# Don't create genarch if it's not needed
-!ifdef GENARCH_XE
-$(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr
-	$(CCAUX) $(GLSRC)genarch.c @$(GLGENDIR)\ccf32.tr $(O_)$(GLOBJ)genarch.obj 
-	$(LINK) FILE $(GLOBJ)genarch.obj NAME $(GENARCH_XE)
-!endif
-
-$(GENCONF_XE): $(GLSRC)genconf.c $(GENCONF_DEPS)
-	$(CCAUX) $(GLSRC)genconf.c $(O_)$(GLOBJ)genconf.obj 
-	$(LINK) FILE $(GLOBJ)genconf.obj NAME $(GENCONF_XE)
-
-$(GENDEV_XE): $(GLSRC)gendev.c $(GENDEV_DEPS)
-	$(CCAUX) $(GLSRC)gendev.c $(O_)$(GLOBJ)gendev.obj 
-	$(LINK) FILE $(GLOBJ)gendev.obj NAME $(GENDEV_XE)
-
-$(GENHT_XE): $(GLSRC)genht.c $(GENHT_DEPS)
-	$(CCAUX) $(GENHT_CFLAGS) $(GLSRC)genht.c $(O_)$(GLOBJ)genht.obj 
-	$(LINK) FILE $(GLOBJ)genht.obj NAME $(GENHT_XE)
-
-# -------------------------------- Library -------------------------------- #
-
-# make sure the target directories exist - use special Watcom .BEFORE
-# (This is not the best way to do this, but we will have to wait until
-# the makefiles get disentangled to do it better.)
-.BEFORE
-	@if not exist $(GLGENDIR) mkdir $(GLGENDIR)
-	@if not exist $(GLOBJDIR) mkdir $(GLOBJDIR)
-	@if not exist $(PSGENDIR) mkdir $(PSGENDIR)
-	@if not exist $(PSOBJDIR) mkdir $(PSOBJDIR)
-	@if not exist $(BINDIR) mkdir $(BINDIR)
-
-# See winlib.mak
-
-# ---------------------------- Watcom objects ----------------------------- #
-
-$(GLOBJ)gp_mktmp.$(OBJ): $(GLSRC)gp_mktmp.c $(stat__h) $(string__h)
-	$(GLCC) $(GLO_)gp_mktmp.$(OBJ) $(C_) $(GLSRC)gp_mktmp.c
-
-# ----------------------------- Main program ------------------------------ #
-
-#LIBCTR=libc32.tr
-LIBCTR=
-
-GSCONSOLE_XE=$(BINDIR)\$(GSCONSOLE).exe
-GSDLL_DLL=$(BINDIR)\$(GSDLL).dll
-
-DWOBJLINK=$(PSOBJ)dwdll.obj, $(GLOBJ)dwimg.obj, $(PSOBJ)dwmain.obj, $(GLOBJ)dwtext.obj, $(PSOBJ)gscdefw.obj, $(PSOBJ)gp_wgetw.obj
-DWOBJNOLINK= $(PSOBJ)dwnodll.obj, $(GLOBJ)dwimg.obj, $(PSOBJ)dwmain.obj, $(GLOBJ)dwtext.obj
-OBJCLINK=$(PSOBJ)dwmainc.obj, $(PSOBJ)dwdllc.obj, $(PSOBJ)gscdefw.obj, $(PSOBJ)gp_wgetw.obj
-OBJCNOLINK=$(PSOBJ)dwmainc.obj, $(PSOBJ)dwnodllc.obj
-
-!ifneq MAKEDLL 0
-
-# The non DLL compiles of the some modules also in the DLL
-$(GLOBJ)gp_wgetw.$(OBJ): $(GLSRC)gp_wgetv.c $(AK) $(gscdefs_h)
-	$(CC) $(COMPILE_FOR_CONSOLE_EXE) $(GLCCFLAGS) $(CCWINFLAGS) $(I_)$(GLI_)$(_I) $(GLF_) $(GLO_)gp_wgetw.$(OBJ) $(C_) $(GLSRC)gp_wgetv.c
-
-$(GLOBJ)gscdefw.$(OBJ): $(GLGEN)gscdefs.c $(AK) $(gscdefs_h)
-	$(CC) $(COMPILE_FOR_CONSOLE_EXE) $(GLCCFLAGS) $(CCWINFLAGS) $(I_)$(GLI_)$(_I) $(GLF_) $(GLO_)gscdefw.$(OBJ) $(C_) $(GLGEN)gscdefs.c
-
-# The graphical small EXE loader
-$(GS_XE): $(GSDLL_DLL) $(PSOBJ)$(GSDLL).lib $(DWOBJ) $(GSCONSOLE_XE) $(PSOBJ)$(GS).res \
-		$(GLOBJ)gp_wgetw.obj $(GLOBJ)gscdefw.obj
-	$(LINK) system nt_win $(LCT) Name $(GS_XE) File $(DWOBJLINK) Library $(PSOBJ)$(GSDLL).lib
-
-# The console mode small EXE loader
-$(GSCONSOLE_XE): $(OBJC) $(PSOBJ)$(GS).res $(PSSRCDIR)\dw32c.def \
-		$(GLOBJ)gp_wgetw.obj $(GLOBJ)gscdefw.obj
-	$(LINK) system nt option map $(LCT) Name $(GSCONSOLE_XE) File $(OBJCLINK) Library $(PSOBJ)$(GSDLL).lib
-
-# The big DLL
-$(GSDLL_DLL): $(GS_ALL) $(DEVS_ALL) $(PSOBJ)gsdll.$(OBJ) $(GLOBJ)gp_mktmp.obj $(PSOBJ)$(GSDLL).res $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	$(LINK) system nt_dll initinstance terminstance $(LCT) Name $(GSDLL_DLL) File $(GLOBJ)gsdll.obj $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(GLOBJ)gp_mktmp.obj @$(ld_tr) @$(PSSRC)gsdll32w.lnk
-
-$(PSOBJ)$(GSDLL).lib: $(GSDLL_DLL)
-	erase $(PSOBJ)$(GSDLL).lib
-	wlib $(PSOBJ)$(GSDLL) +$(GSDLL_DLL)
-
-!else
-# The big graphical EXE
-$(GS_XE): $(GSCONSOLE_XE) $(GS_ALL) $(DEVS_ALL) $(PSOBJ)gsdll.$(OBJ) $(GLOBJ)gp_mktmp.obj $(DWOBJNO) $(PSOBJ)$(GS).res $(PSOBJ)dwmain32.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	$(LINK) option map $(LCT) Name $(GS) File $(GLOBJ)gsdll,$(OBJ) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) gp_mktmp.obj $(DWOBJNOLINK) @$(ld_tr) 
-
-# The big console mode EXE
-$(GSCONSOLE_XE):  $(GS_ALL) $(DEVS_ALL) $(PSOBJ)gsdll.$(OBJ) $(GLOBJ)gp_mktmp.obj $(OBJCNO) $(PSOBJ)$(GS).res $(PSSRCDIR)\dw32c.def $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	$(LINK) option map $(LCT) Name $(GSCONSOLE_XE) File $(GLOBJ)gsdll,$(OBJ) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(GLOBJ)gp_mktmp.obj $(OBJCNOLINK) @$(ld_tr) 
-!endif
-
-# end of makefile

Deleted: trunk/gs/base/wccommon.mak
===================================================================
--- trunk/gs/base/wccommon.mak	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/wccommon.mak	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,210 +0,0 @@
-#  Copyright (C) 2001-2006 Artifex Software, Inc.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# wccommon.mak
-# Section of Watcom C/C++ makefile common to MS-DOS and MS Windows.
-# We strongly recommend that you read the Watcom section of Make.htm
-# before attempting to build Ghostscript with the Watcom compiler.
-
-# This file is used by watc.mak, watcwin.mak, and watclib.mak.
-# Those files supply the following parameters:
-#   Configuration, public:
-#	GS_LIB_DEFAULT, SEARCH_HERE_FIRST, GS_INIT, FEATURE_DEVS,
-#	DEVICE_DEVS*, COMPILE_INITS, BAND_LIST_*
-#   Configuration, internal, generic:
-#	PLATFORM, MAKEFILE, AK, CC*, DEBUG, CP_, RM_, RMN_
-#   Configuration, internal, specific to DOS/Windows:
-#	TDEBUG, COMPDIR, LIBPATHS,
-#	CPU_TYPE,
-
-# We want Unix-compatible behavior.  This is part of it.
-
-.NOCHECK
-
-# Define additional extensions to keep `make' happy
-
-.EXTENSIONS: .be .z
-
-# Define the auxiliary program dependency. We don't use this.
-
-AK=
-
-# Note that built-in third-party libraries aren't available.
-
-SHARE_JPEG=0
-SHARE_LIBPNG=0
-SHARE_ZLIB=0
-SHARE_JBIG2=0
-SHARE_JPX=0
-
-# Define the extensions for command, object, and executable files.
-
-NULL=
-
-C_=
-CMD=.bat
-D_=-D
-_D_=$(NULL)=
-_D=
-I_=-i=
-II=-i=
-_I=
-NO_OP=%null
-O_=-fo=
-OBJ=obj
-Q=
-RO_=$(O_)
-XE=.exe
-XEAUX=.exe
-
-# Define the executable and shell invocations.
-
-D=\\
-
-EXP=
-SH=
-
-# Define generic commands.
-
-CP_=call $(GLSRCDIR)\cp.bat
-RM_=call $(GLSRCDIR)\rm.bat
-RMN_=call $(GLSRCDIR)\rm.bat
-
-# Define the arguments for genconf.
-
-# wmake interprets & as calling for background execution, and ^ fails on
-# Windows NT.
-CONFILES=-e ~ -p FILE~s~ps
-CONFLDTR=-ol
-
-# Define the names of the Watcom C files.
-# See the comments in watc.mak and watcwin.mak regarding WCVERSION.
-
-!ifeq WCVERSION 11.0
-# 11.0 is currently the same as 10.5.
-COMP=$(%WATCOM)\binw\wcc386
-LINK=$(%WATCOM)\binw\wlink
-STUB=$(%WATCOM)\binw\wstub.exe
-WRC=$(%WATCOM)\binw\wrc.exe
-!endif
-
-!ifeq WCVERSION 10.5
-COMP=$(%WATCOM)\binw\wcc386
-LINK=$(%WATCOM)\binw\wlink
-STUB=$(%WATCOM)\binw\wstub.exe
-WRC=$(%WATCOM)\binw\wrc.exe
-!endif
-
-!ifeq WCVERSION 10.0
-COMP=$(%WATCOM)\binb\wcc386
-LINK=$(%WATCOM)\bin\wlink
-STUB=$(%WATCOM)\binb\wstub.exe
-WRC=$(%WATCOM)\binb\wrc.exe
-!endif
-
-!ifeq WCVERSION 9.5
-COMP=$(%WATCOM)\bin\wcc386
-LINK=$(%WATCOM)\bin\wlinkp
-STUB=$(%WATCOM)\binb\wstub.exe
-WRC=$(%WATCOM)\binb\wrc.exe
-!endif
-
-# 95/NT Watcom compiler versions
-# 10.695 is 10.6 under Windows 95 or NT (32 bit hosted tools)
-!ifeq WCVERSION 10.695
-COMP=$(%WATCOM)\binnt\wcc386
-LINK=$(%WATCOM)\binnt\wlink
-STUB=$(%WATCOM)\binw\wstub.exe
-WRC=$(%WATCOM)\binnt\wrc.exe
-WAT32=1
-!endif
-
-# Defaults
-!ifndef COMP
-COMP=$(%WATCOM)\bin\wcc386p
-LINK=$(%WATCOM)\bin\wlinkp
-STUB=$(%WATCOM)\binb\wstub.exe
-WRC=$(%WATCOM)\binb\rc.exe
-!endif
-!ifndef WAT32
-WAT32=0
-!endif
-
-!ifeq WAT32 0
-INCDIRS=$(%WATCOM)\h
-!else
-INCDIRS=$(%WATCOM)\h;$(%WATCOM)\h\nt
-!endif
-WBIND=$(%WATCOM)\binb\wbind.exe
-
-# Define the generic compilation flags.
-
-!ifeq CPU_TYPE 586
-!ifeq FPU_TYPE 0
-FPU_TYPE=387
-!endif
-!else
-!ifeq CPU_TYPE 486
-!ifeq FPU_TYPE 0
-FPU_TYPE=387
-!endif
-!endif
-!endif
-
-!ifeq FPU_TYPE 387
-FPFLAGS=-fpi87
-!else
-!ifeq FPU_TYPE 287
-FPFLAGS=-fpi287
-!else
-!ifeq FPU_TYPE -1
-FPFLAGS=-fpc
-!else
-FPFLAGS=-fpi
-!endif
-!endif
-!endif
-
-# Make sure we get the right default target for make.
-
-dosdefault: default
-	$(NO_OP)
-
-# Define the compilation flags.
-
-# Run-time debugging and stack checking
-!ifneq DEBUG 0
-CD=-dDEBUG
-CS=
-!else
-CD=
-CS=-oeilnt -s
-!endif
-
-# Debugger symbols
-!ifneq TDEBUG 0
-CT=-d2
-LCT=DEBUG ALL
-!else
-CT=-d1
-LCT=DEBUG LINES
-!endif
-
-GENOPT=$(CD) $(CT) $(CS)
-
-CCOPT=-d+ -i=$(INCDIRS) -zq -zp8 -ei
-CCFLAGS=$(CCOPT) $(GENOPT) $(PLATOPT) $(FPFLAGS) $(CFLAGS) $(XCFLAGS)
-CC=$(COMP) -oi $(CCFLAGS)
-CCAUX=$(COMP) -oi $(CCOPT) $(FPFLAGS)
-CC_=$(CC)
-CC_NO_WARN=$(CC_)

Deleted: trunk/gs/base/wctail.mak
===================================================================
--- trunk/gs/base/wctail.mak	2010-10-01 02:58:15 UTC (rev 11749)
+++ trunk/gs/base/wctail.mak	2010-10-01 19:36:06 UTC (rev 11750)
@@ -1,75 +0,0 @@
-#  Copyright (C) 2001-2006 Artifex Software, Inc.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# wctail.mak
-# Last part of Watcom C/C++ makefile common to MS-DOS and MS Windows.
-
-# Define the name of this makefile.
-WCTAIL_MAK=$(GLSRCDIR)\wctail.mak
-
-# Include the generic makefiles, except for devs.mak, contrib.mak, int.mak
-#!include $(COMMONDIR)/watcdefs.mak
-#!include $(COMMONDIR)/pcdefs.mak
-#!include $(COMMONDIR)/generic.mak
-!include $(GLSRCDIR)\version.mak
-!include $(GLSRCDIR)\gs.mak
-!include $(GLSRCDIR)\lib.mak
-!include $(GLSRCDIR)\jpeg.mak
-# zlib.mak must precede libpng.mak
-!include $(GLSRCDIR)\zlib.mak
-!include $(GLSRCDIR)\libpng.mak
-!include $(GLSRCDIR)\jbig2.mak
-!include $(GLSRCDIR)\icclib.mak
-!include $(GLSRCDIR)\ijs.mak
-
-# -------------------------- Auxiliary programs --------------------------- #
-
-temp_tr=$(GLOBJ)_temp_.tr
-
-$(ECHOGS_XE): $(AUXGEN)echogs.$(OBJ)
-	echo OPTION STUB=$(STUB) >$(temp_tr)
-	echo $(LIBPATHS) >>$(temp_tr)
-	$(LINK) @$(temp_tr) FILE $(AUXGEN)echogs
-
-$(AUXGEN)echogs.$(OBJ): $(GLSRC)echogs.c
-	$(CCAUX) $(GLSRC)echogs.c $(O_)$(AUXGEN)echogs.$(OBJ)
-
-$(GENARCH_XE): $(AUXGEN)genarch.$(OBJ)
-	echo $(LIBPATHS) >$(temp_tr)
-	$(LINK) @$(temp_tr) FILE $(AUXGEN)genarch
-
-$(AUXGEN)genarch.$(OBJ): $(GLSRC)genarch.c $(stdpre_h)
-	$(CCAUX) $(GLSRC)genarch.c $(O_)$(AUXGEN)genarch.$(OBJ)
-
-$(GENCONF_XE): $(AUXGEN)genconf.$(OBJ)
-	echo OPTION STUB=$(STUB) >$(temp_tr)
-	echo OPTION STACK=8k >>$(temp_tr)
-	echo $(LIBPATHS) >>$(temp_tr)
-	$(LINK) @$(temp_tr) FILE $(AUXGEN)genconf
-
-$(AUXGEN)genconf.$(OBJ): $(GLSRC)genconf.c $(stdpre_h)
-	$(CCAUX) $(GLSRC)genconf.c $(O_)$(AUXGEN)genconf.$(OBJ)
-
-$(GENDEV_XE): $(AUXGEN)gendev.$(OBJ)
-	echo OPTION STUB=$(STUB) >$(temp_tr)
-	echo OPTION STACK=8k >>$(temp_tr)
-	echo $(LIBPATHS) >>$(temp_tr)
-	$(LINK) @$(temp_tr) FILE $(AUXGEN)gendev
-
-$(AUXGEN)gendev.$(OBJ): $(GLSRC)gendev.c $(stdpre_h)
-	$(CCAUX) $(GLSRC)gendev.c $(O_)$(AUXGEN)gendev.$(OBJ)
-
-# No special gconfig_.h is needed.
-# Watcom `make' supports output redirection.
-$(gconfig__h): $(WCTAIL_MAK)
-	echo /* This file deliberately left blank. */ >$(gconfig__h)



More information about the gs-commits mailing list