Removed unused and outdated Watcom build files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/jpeg/makefile.wat b/src/jpeg/makefile.wat
deleted file mode 100644 (file)
index 88ed70b..0000000
--- a/src/jpeg/makefile.wat
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/binb/wmake.exe
-#
-# File:                makefile.wat
-# Author:      Julian Smart
-# Created:     1998
-# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-#
-# Makefile : Builds JPEG library for Watcom C++, WIN32
-
-WXDIR = ..\..
-EXTRACPPFLAGS=-i=..\zlib
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET = $(WXLIB)\jpeg$(WATCOM_SUFFIX).lib
-
-# library object files common to compression and decompression
-COMOBJECTS = &
-    $(OUTPUTDIR)\jcomapi.obj &
-    $(OUTPUTDIR)\jutils.obj &
-    $(OUTPUTDIR)\jerror.obj &
-    $(OUTPUTDIR)\jmemmgr.obj &
-    $(OUTPUTDIR)\jmemnobs.obj
-
-# compression library object files
-CLIBOBJECTS = &
-    $(OUTPUTDIR)\jcapimin.obj &
-    $(OUTPUTDIR)\jcapistd.obj &
-    $(OUTPUTDIR)\jctrans.obj &
-    $(OUTPUTDIR)\jcparam.obj &
-    $(OUTPUTDIR)\jdatadst.obj &
-    $(OUTPUTDIR)\jcinit.obj &
-    $(OUTPUTDIR)\jcmaster.obj &
-    $(OUTPUTDIR)\jcmarker.obj &
-    $(OUTPUTDIR)\jcmainct.obj &
-    $(OUTPUTDIR)\jcprepct.obj &
-    $(OUTPUTDIR)\jccoefct.obj &
-    $(OUTPUTDIR)\jccolor.obj &
-    $(OUTPUTDIR)\jcsample.obj &
-    $(OUTPUTDIR)\jchuff.obj &
-    $(OUTPUTDIR)\jcphuff.obj &
-    $(OUTPUTDIR)\jcdctmgr.obj &
-    $(OUTPUTDIR)\jfdctfst.obj &
-    $(OUTPUTDIR)\jfdctflt.obj &
-    $(OUTPUTDIR)\jfdctint.obj
-
-# decompression library object files
-DLIBOBJECTS = &
-    $(OUTPUTDIR)\jdapimin.obj &
-    $(OUTPUTDIR)\jdapistd.obj &
-    $(OUTPUTDIR)\jdtrans.obj &
-    $(OUTPUTDIR)\jdatasrc.obj &
-    $(OUTPUTDIR)\jdmaster.obj &
-    $(OUTPUTDIR)\jdinput.obj &
-    $(OUTPUTDIR)\jdmarker.obj &
-    $(OUTPUTDIR)\jdhuff.obj &
-    $(OUTPUTDIR)\jdphuff.obj &
-    $(OUTPUTDIR)\jdmainct.obj &
-    $(OUTPUTDIR)\jdcoefct.obj &
-    $(OUTPUTDIR)\jdpostct.obj &
-    $(OUTPUTDIR)\jddctmgr.obj &
-    $(OUTPUTDIR)\jidctfst.obj &
-    $(OUTPUTDIR)\jidctflt.obj &
-    $(OUTPUTDIR)\jidctint.obj &
-    $(OUTPUTDIR)\jidctred.obj &
-    $(OUTPUTDIR)\jdsample.obj &
-    $(OUTPUTDIR)\jdcolor.obj &
-    $(OUTPUTDIR)\jquant1.obj &
-    $(OUTPUTDIR)\jquant2.obj &
-    $(OUTPUTDIR)\jdmerge.obj
-
-# These objectfiles are included in libjpeg.lib
-OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
-
-all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
-
-$(OUTPUTDIR):
-       @if not exist $^@ mkdir $^@
-
-LBCFILE=$(OUTPUTDIR)\jpeg.lbc
-$(LIBTARGET) : $(OBJECTS)
-    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
-
-clean: .SYMBOLIC
-    -erase $(OUTPUTDIR)\*.obj
-    -erase $(LIBTARGET)
-    -erase $(OUTPUTDIR)\*.pch
-    -erase $(OUTPUTDIR)\*.err
-    -erase $(OUTPUTDIR)\*.lbc
-
-cleanall:   clean
-

diff --git a/src/makelib.wat b/src/makelib.wat
deleted file mode 100644 (file)
index 110f039..0000000
--- a/src/makelib.wat
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-#
-
-
-THISDIR = $+ $(%cdrive):$(%cwd) $-
-# set OUTPUTDIR to the directory to be used for the .obj files created during
-# the build (under $THISDIR)
-!ifndef OUTPUTDIR
-OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
-# no trailing slash for win98
-!endif
-
-!include $(WXDIR)\src\makewat.env
-
-
-
-all: MAKDIR $(LIBTARGET) .SYMBOLIC
-
-MAKDIR:  .SYMBOLIC
-       @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
-
-# the name of the file containing the objects to be put in the library
-LBCFILE=$(LIBTARGET).lbc
-$(LIBTARGET) : $(OBJECTS)
-    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)
-
-clean:   .SYMBOLIC
-    -erase $(OUTPUTDIR)\*.obj
-    -erase $(OUTPUTDIR)\*.bak
-    -erase $(OUTPUTDIR)\*.err
-    -erase $(OUTPUTDIR)\*.pch
-    -erase $(OUTPUTDIR)\*.lib
-    -erase $(OUTPUTDIR)\*.lbc
-    -erase $(OUTPUTDIR)\*.res
-    -erase $(OUTPUTDIR)\*.exe
-    -erase $(OUTPUTDIR)\*.lbc
-    -erase $(LIBTARGET)
-

diff --git a/src/makeprog.wat b/src/makeprog.wat
deleted file mode 100644 (file)
index d2f8809..0000000
--- a/src/makeprog.wat
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-#
-# $+ .. $- means we get the result directly
-THISDIR = $+ $(%cdrive):$(%cwd) $-
-
-WXDIR = $(%WXWIN)
-!ifndef EXEDIR
-OUTPUTDIR = $(THISDIR)\Watcom 
-!else
-OUTPUTDIR = $(THISDIR)\$(EXEDIR)
-!ifeq EXEDIR "."
-OUTPUTDIR = $(THISDIR)
-!endif
-!endif
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-LNK = $(OUTPUTDIR)\$(PROGRAM).lnk
-
-all: MAKEDIR $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC
-
-MAKEDIR: .SYMBOLIC
-       @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
-
-!ifeq wxUSE_GUI 0
-RESFILE=
-!else
-RESFILE=$(OUTPUTDIR)\$(PROGRAM).res
-!endif
-
-$(OUTPUTDIR)\$(PROGRAM).exe : $(OBJECTS) $(RESFILE) $(LNK) $(WXLIB)\$(LIBNAME).lib
-    wlink @$(LNK)
-!ifneq wxUSE_GUI 0
-    $(BINDCOMMAND) $(RESFILE)
-!endif
-
-!ifneq wxUSE_GUI 0
-$(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-     $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
-!endif
-
-$(LNK) : .SYMBOLIC
-    %create $(LNK)
-    @%append $(LNK) $(LDFLAGS)
-    @%append $(LNK) $(DEBUGINFO)
-    @%append $(LNK) system $(LINKSYSTEM)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(OUTPUTDIR)\$(PROGRAM).exe
-    @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
-    @for %i in ($(LIBS)) do @%append $(LNK) lib %i
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i
-
-clean:   .SYMBOLIC
-    -erase $(OUTPUTDIR)\*.obj
-    -erase $(OUTPUTDIR)\*.bak
-    -erase $(OUTPUTDIR)\*.err
-    -erase $(OUTPUTDIR)\*.pch
-    -erase $(OUTPUTDIR)\*.lib
-    -erase $(LNK)
-    -erase $(OUTPUTDIR)\*.res
-    -erase $(OUTPUTDIR)\*.exe
-    -erase $(OUTPUTDIR)\*.lbc
-       -rmdir $(OUTPUTDIR)
-

diff --git a/src/makewat.env b/src/makewat.env
deleted file mode 100644 (file)
index 2b0e89e..0000000
--- a/src/makewat.env
+++ /dev/null
@@ -1,178 +0,0 @@
-###############################################################################
-# File:         src/makewat.env
-# Purpose:      Watcom environments for wxWindows makefiles.
-# Author:       Julian Smart and others
-# Version:      $Id$
-# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-###############################################################################
-
-# The following environment variables must be set:
-#
-#   WATCOM:    set to where the compiler is installed
-#   WXWIN:     set to where the wxWindows is installed
-#   PATH:      set correctly, i.e. contains all Watcom directories
-#   LIB:       same as PATH
-#   INCLUDE:   same as PATH
-
-# set wxUSE_GUI=0 to build wxBase instead of (default) wxMSW
-!ifndef wxUSE_GUI
-wxUSE_GUI=1
-!endif
-
-# set FINAL=1 to disable debug and enable optimizations
-!ifndef FINAL
-FINAL=0
-!endif
-
-# set WATCOM_SUFFIX to nothing if you use only Watcom compiler, set it to
-# something Watcom-specific if you want to build wxWindows with more than one
-# compiler
-WATCOM_SUFFIX=_w
-
-# change/remove this if you want to create programs for older Windows versions,
-# increase the version to be able to use more Win2K+-only features
-WINVERFLAGS = /dWINVER=0x400 /d_WIN32_IE=0x0300
-
-# optimize for space/time: /os or /ot
-!ifeq FINAL 1
-OPTFLAGS=/oails /5r
-!else
-OPTFLAGS=/od
-!endif
-
-
-###############################################################################
-# You shouldn't have to modify anything after this point
-###############################################################################
-
-.EXTENSIONS:
-.EXTENSIONS: .exe .obj .c .cc .cpp .res .rc .def
-
-!ifndef %WATCOM
-!error WATCOM environment variable must be set!
-!endif
-WATCOMDIR=$(%WATCOM)
-
-!ifndef %WXWIN
-!error WXWIN environment variable must be set!
-!endif
-WXDIR = $(%WXWIN)
-
-# Suffixes
-OBJSUFF=obj
-SRCSUFF=cpp
-
-!ifeq FINAL 1
-WXDEBUG=0
-!else
-WXDEBUG=1
-!endif
-
-!ifeq WXDEBUG 1
-DEBUGFLAGS  = /D__WXDEBUG__
-DEBUGCFLAGS = $(DEBUGFLAGS) /d2
-DEBUGCXXFLAGS = $(DEBUGFLAGS) /d2i
-DEBUGINFO   = debug all
-DEBUGSUFFIX = d
-!else
-DEBUGCFLAGS =
-DEBUGCXXFLAGS =
-DEBUGINFO   =
-DEBUGSUFFIX = 
-!endif
-
-# TOOLKIT is used as the name of lib subdir containing wx/setup.h
-# BASEDIRPREFIX is used to construct OUTPUTDIR
-!ifeq wxUSE_GUI 0
-TOOLKIT = base
-BASEDIRPREFIX = Base
-LINKSYSTEM = nt
-!else
-TOOLKIT = msw
-LINKSYSTEM = nt_win
-BASEDIRPREFIX = 
-!endif
-
-ARCHINCDIR=$(WXDIR)\lib\$(TOOLKIT)$(DEBUGSUFFIX)
-
-# set the things which depend on debug/release
-#
-# note that the values for LIBPAGESIZE are minimal possible, the library
-# doesn't link (Error! Library too large) with values smaller than given
-!ifeq FINAL 1
-CONFIGURATION=Release
-LIBPAGESIZE=/p=1024
-!else
-CONFIGURATION=Debug
-LIBPAGESIZE=/p=2048
-!endif
-
-# set OUTPUTDIR to the directory to be used for the .obj files created during
-# the build (under $WXWIN)
-!ifndef OUTPUTDIR
-OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
-# no trailing slash for win98
-!endif
-
-!ifneq NOPRECOMP 1
-PRECOMP     = /fh=$(OUTPUTDIR)\watcom.pch
-!endif
-
-# the basename of the library
-LIBNAME=wx$(TOOLKIT)$(DEBUGSUFFIX)$(WATCOM_SUFFIX)
-
-# only LEVEL=386 is currently supported, 16 bit compilation is probably broken
-LEVEL       = 386
-CXX         = wpp$(LEVEL)
-CC          = wcc$(LEVEL)
-LIB         = wlib /q
-RC          = wrc
-BINDCOMMAND = wrc
-WATLIBDIR   = $(WATCOMDIR)\lib386\nt
-STACK       = option stack=64k
-LIBS        = $(WXDIR)\lib\$(LIBNAME).lib &
-              $(WXDIR)\lib\regex$(WATCOM_SUFFIX).lib &
-              $(WXDIR)\lib\zlib$(WATCOM_SUFFIX).lib &
-!ifneq wxUSE_GUI 0
-              $(WXDIR)\lib\png$(WATCOM_SUFFIX).lib &
-              $(WXDIR)\lib\tiff$(WATCOM_SUFFIX).lib &
-              $(WXDIR)\lib\jpeg$(WATCOM_SUFFIX).lib &
-!endif
-              $(WATLIBDIR)\comctl32.lib &
-              $(WATLIBDIR)\comdlg32.lib &
-              $(WATLIBDIR)\wsock32.lib &
-              $(WATLIBDIR)\odbc32.lib &
-              $(WATLIBDIR)\ole32.lib &
-              $(WATLIBDIR)\oleaut32.lib &
-              $(WATLIBDIR)\opengl32.lib &
-              $(WATLIBDIR)\uuid.lib
-IFLAGS      = -i=$(ARCHINCDIR);$(WXDIR)\include &
-              -i=$(%watcom)\h;$(%watcom)\h\nt &
-              -i=$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff &
-              -i=$(WXDIR)\include\wx\msw\gnuwin32
-RESFLAGS    = -q -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS)
-
-# NB: /bm switch is needed for thread-safe runtime, if you don't use
-#     wxThread you may remove it
-CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)
-!ifeq wxUSE_GUI 0
-CPPFLAGS += /dwxUSE_GUI=0
-!endif
-
-# zm and zv as well as the liker options below are used to make the resulting
-# .exe smaller
-CFLAGS = $(CPPFLAGS) $(DEBUGCFLAGS) $(EXTRACFLAGS) /zm
-CXXFLAGS = $(CPPFLAGS) $(DEBUGCXXFLAGS) $(PRECOMP) /zm /zv /w=8 $(EXTRACXXFLAGS)
-LDFLAGS = option eliminate, vfremoval
-
-.cpp.obj: # $< # .AUTODEPEND
-    *$(CXX) $(CXXFLAGS) $<
-
-.c.obj: # $< # .AUTODEPEND
-    *$(CC) $(CFLAGS) $<
-
-defaulttarget: all .SYMBOLIC
-
-erasepch:   .SYMBOLIC
-    -erase $(OUTPUTDIR)\watcom.pch
-

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
deleted file mode 100644 (file)
index 118ad35..0000000
--- a/src/mgl/makefile.wat
+++ /dev/null
@@ -1,1219 +0,0 @@
-#!/binb/wmake.exe
-
-# This file was automatically generated by tmake 
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
-
-#
-# File:     makefile.wat
-# Author:   Julian Smart & Vaclav Slavik
-# Created:  1998
-#
-# Makefile : Builds wxWindows library for Watcom C++, DOS+MGL
-#
-# NOTE: This file is generated from wat.t by tmake, but not all bugs have
-# been removed from this process. If wxWindows doesn't compile,
-# check the following and edit this makefile accordingly:
-#
-# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
-#   They may also be wrongly specified as extended.cpp, etc.
-
-WXDIR = ..\..
-
-!include makewat.env
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET   = $(WXLIB)\wx.lib
-DUMMY=dummydll
-# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
-
-EXTRATARGETS = png zlib jpeg tiff regex
-EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
-GENDIR=$(WXDIR)\src\generic
-COMMDIR=$(WXDIR)\src\common
-JPEGDIR=$(WXDIR)\src\jpeg
-TIFFDIR=$(WXDIR)\src\tiff
-MGLDIR=$(WXDIR)\src\mgl
-UNIVDIR=$(WXDIR)\src\univ
-UNIVTHEMEDIR=$(WXDIR)\src\univ\themes
-HTMLDIR=$(WXDIR)\src\html
-
-DOCDIR = $(WXDIR)\docs
-
-GENERICOBJS= accel.obj &
-       busyinfo.obj &
-       calctrl.obj &
-       caret.obj &
-       choicdgg.obj &
-       colrdlgg.obj &
-       dcbuffer.obj &
-       dcpsg.obj &
-       dirctrlg.obj &
-       dirdlgg.obj &
-       dragimgg.obj &
-       fdrepdlg.obj &
-       filedlgg.obj &
-       fontdlgg.obj &
-       grid.obj &
-       gridctrl.obj &
-       gridsel.obj &
-       helpext.obj &
-       imaglist.obj &
-       laywin.obj &
-       listctrl.obj &
-       logg.obj &
-       mdig.obj &
-       msgdlgg.obj &
-       numdlgg.obj &
-       panelg.obj &
-       printps.obj &
-       prntdlgg.obj &
-       progdlgg.obj &
-       sashwin.obj &
-       scrlwing.obj &
-       selstore.obj &
-       spinctlg.obj &
-       splash.obj &
-       splitter.obj &
-       tabg.obj &
-       tbarsmpl.obj &
-       textdlgg.obj &
-       timer.obj &
-       tipdlg.obj &
-       tipwin.obj &
-       treectlg.obj &
-       wizard.obj
-
-COMMONOBJS = &
-       y_tab.obj &
-       accesscmn.obj &
-       appbase.obj &
-       appcmn.obj &
-       artprov.obj &
-       artstd.obj &
-       bmpbase.obj &
-       choiccmn.obj &
-       clipcmn.obj &
-       clntdata.obj &
-       cmdline.obj &
-       cmdproc.obj &
-       cmndata.obj &
-       config.obj &
-       containr.obj &
-       cshelp.obj &
-       ctrlcmn.obj &
-       ctrlsub.obj &
-       datacmn.obj &
-       datetime.obj &
-       datstrm.obj &
-       db.obj &
-       dbgrid.obj &
-       dbtable.obj &
-       dcbase.obj &
-       dircmn.obj &
-       dlgcmn.obj &
-       dndcmn.obj &
-       dobjcmn.obj &
-       docmdi.obj &
-       docview.obj &
-       dpycmn.obj &
-       dseldlg.obj &
-       dynarray.obj &
-       dynlib.obj &
-       dynload.obj &
-       effects.obj &
-       encconv.obj &
-       event.obj &
-       extended.obj &
-       fddlgcmn.obj &
-       ffile.obj &
-       file.obj &
-       fileconf.obj &
-       filefn.obj &
-       filename.obj &
-       filesys.obj &
-       fldlgcmn.obj &
-       fmapbase.obj &
-       fontcmn.obj &
-       fontmap.obj &
-       framecmn.obj &
-       fs_inet.obj &
-       fs_mem.obj &
-       fs_zip.obj &
-       ftp.obj &
-       gaugecmn.obj &
-       gdicmn.obj &
-       geometry.obj &
-       gifdecod.obj &
-       hash.obj &
-       hashmap.obj &
-       helpbase.obj &
-       http.obj &
-       iconbndl.obj &
-       imagall.obj &
-       imagbmp.obj &
-       image.obj &
-       imagfill.obj &
-       imaggif.obj &
-       imagiff.obj &
-       imagjpeg.obj &
-       imagpcx.obj &
-       imagpng.obj &
-       imagpnm.obj &
-       imagtiff.obj &
-       imagxpm.obj &
-       intl.obj &
-       ipcbase.obj &
-       layout.obj &
-       lboxcmn.obj &
-       list.obj &
-       log.obj &
-       longlong.obj &
-       matrix.obj &
-       memory.obj &
-       menucmn.obj &
-       mimecmn.obj &
-       module.obj &
-       msgout.obj &
-       mstream.obj &
-       nbkbase.obj &
-       object.obj &
-       paper.obj &
-       popupcmn.obj &
-       prntbase.obj &
-       process.obj &
-       protocol.obj &
-       quantize.obj &
-       radiocmn.obj &
-       regex.obj &
-       rgncmn.obj &
-       sckaddr.obj &
-       sckfile.obj &
-       sckipc.obj &
-       sckstrm.obj &
-       settcmn.obj &
-       sizer.obj &
-       socket.obj &
-       statbar.obj &
-       stopwatch.obj &
-       strconv.obj &
-       stream.obj &
-       string.obj &
-       sysopt.obj &
-       taskbarcmn.obj &
-       tbarbase.obj &
-       textbuf.obj &
-       textcmn.obj &
-       textfile.obj &
-       timercmn.obj &
-       tokenzr.obj &
-       toplvcmn.obj &
-       treebase.obj &
-       txtstrm.obj &
-       unzip.obj &
-       url.obj &
-       utilscmn.obj &
-       valgen.obj &
-       validate.obj &
-       valtext.obj &
-       variant.obj &
-       wfstream.obj &
-       wincmn.obj &
-       wxchar.obj &
-       xpmdecod.obj &
-       zipstrm.obj &
-       zstream.obj
-
-MGLOBJS = app.obj &
-       bitmap.obj &
-       brush.obj &
-       clipbrd.obj &
-       colour.obj &
-       cursor.obj &
-       data.obj &
-       dc.obj &
-       dcclient.obj &
-       dcmemory.obj &
-       dcscreen.obj &
-       dirmgl.obj &
-       evtloop.obj &
-       font.obj &
-       fontenum.obj &
-       fontutil.obj &
-       gdiobj.obj &
-       icon.obj &
-       palette.obj &
-       pen.obj &
-       region.obj &
-       settings.obj &
-       toplevel.obj &
-       utils.obj &
-       window.obj
-
-UNIVOBJS = bmpbuttn.obj &
-       button.obj &
-       checkbox.obj &
-       checklst.obj &
-       choice.obj &
-       colschem.obj &
-       combobox.obj &
-       control.obj &
-       dialog.obj &
-       framuniv.obj &
-       gauge.obj &
-       inpcons.obj &
-       inphand.obj &
-       listbox.obj &
-       menu.obj &
-       notebook.obj &
-       radiobox.obj &
-       radiobut.obj &
-       renderer.obj &
-       scrarrow.obj &
-       scrolbar.obj &
-       scrthumb.obj &
-       slider.obj &
-       spinbutt.obj &
-       statbmp.obj &
-       statbox.obj &
-       statline.obj &
-       stattext.obj &
-       statusbr.obj &
-       textctrl.obj &
-       theme.obj &
-       toolbar.obj &
-       topluniv.obj &
-       winuniv.obj
-
-UNIVTHEMEOBJS = gtk.obj &
-       metal.obj &
-       win32.obj
-
-HTMLOBJS = helpctrl.obj &
-       helpdata.obj &
-       helpfrm.obj &
-       htmlcell.obj &
-       htmlfilt.obj &
-       htmlpars.obj &
-       htmltag.obj &
-       htmlwin.obj &
-       htmprint.obj &
-       m_dflist.obj &
-       m_fonts.obj &
-       m_hline.obj &
-       m_image.obj &
-       m_layout.obj &
-       m_links.obj &
-       m_list.obj &
-       m_pre.obj &
-       m_style.obj &
-       m_tables.obj &
-       winpars.obj
-
-# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
-
-SETUP_H=$(ARCHINCDIR)\wx\setup.h
-
-all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
-
-$(ARCHINCDIR)\wx:
-    mkdir $(ARCHINCDIR)
-    mkdir $(ARCHINCDIR)\wx
-
-$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\univ\setup.h $@
-
-$(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
-
-clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
-    -erase *.obj
-    -erase $(LIBTARGET)
-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
-
-cleanall:   clean
-
-app.obj:     $(MGLDIR)\app.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-bitmap.obj:     $(MGLDIR)\bitmap.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-brush.obj:     $(MGLDIR)\brush.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-clipbrd.obj:     $(MGLDIR)\clipbrd.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-colour.obj:     $(MGLDIR)\colour.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-cursor.obj:     $(MGLDIR)\cursor.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-data.obj:     $(MGLDIR)\data.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dc.obj:     $(MGLDIR)\dc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcclient.obj:     $(MGLDIR)\dcclient.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcmemory.obj:     $(MGLDIR)\dcmemory.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcscreen.obj:     $(MGLDIR)\dcscreen.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dirmgl.obj:     $(MGLDIR)\dirmgl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-evtloop.obj:     $(MGLDIR)\evtloop.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-font.obj:     $(MGLDIR)\font.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontenum.obj:     $(MGLDIR)\fontenum.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontutil.obj:     $(MGLDIR)\fontutil.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gdiobj.obj:     $(MGLDIR)\gdiobj.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-icon.obj:     $(MGLDIR)\icon.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-palette.obj:     $(MGLDIR)\palette.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-pen.obj:     $(MGLDIR)\pen.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-region.obj:     $(MGLDIR)\region.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-settings.obj:     $(MGLDIR)\settings.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-toplevel.obj:     $(MGLDIR)\toplevel.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-utils.obj:     $(MGLDIR)\utils.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-window.obj:     $(MGLDIR)\window.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-########################################################
-# wxUNIVERSAL objects (always compiled)
-
-bmpbuttn.obj:     $(UNIVDIR)\bmpbuttn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-button.obj:     $(UNIVDIR)\button.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-checkbox.obj:     $(UNIVDIR)\checkbox.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-checklst.obj:     $(UNIVDIR)\checklst.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-choice.obj:     $(UNIVDIR)\choice.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-colschem.obj:     $(UNIVDIR)\colschem.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-combobox.obj:     $(UNIVDIR)\combobox.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-control.obj:     $(UNIVDIR)\control.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dialog.obj:     $(UNIVDIR)\dialog.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-framuniv.obj:     $(UNIVDIR)\framuniv.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gauge.obj:     $(UNIVDIR)\gauge.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-inpcons.obj:     $(UNIVDIR)\inpcons.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-inphand.obj:     $(UNIVDIR)\inphand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-listbox.obj:     $(UNIVDIR)\listbox.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-menu.obj:     $(UNIVDIR)\menu.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-notebook.obj:     $(UNIVDIR)\notebook.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-radiobox.obj:     $(UNIVDIR)\radiobox.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-radiobut.obj:     $(UNIVDIR)\radiobut.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-renderer.obj:     $(UNIVDIR)\renderer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-scrarrow.obj:     $(UNIVDIR)\scrarrow.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-scrolbar.obj:     $(UNIVDIR)\scrolbar.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-scrthumb.obj:     $(UNIVDIR)\scrthumb.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-slider.obj:     $(UNIVDIR)\slider.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-spinbutt.obj:     $(UNIVDIR)\spinbutt.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-statbmp.obj:     $(UNIVDIR)\statbmp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-statbox.obj:     $(UNIVDIR)\statbox.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-statline.obj:     $(UNIVDIR)\statline.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-stattext.obj:     $(UNIVDIR)\stattext.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-statusbr.obj:     $(UNIVDIR)\statusbr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-textctrl.obj:     $(UNIVDIR)\textctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-theme.obj:     $(UNIVDIR)\theme.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-toolbar.obj:     $(UNIVDIR)\toolbar.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-topluniv.obj:     $(UNIVDIR)\topluniv.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-winuniv.obj:     $(UNIVDIR)\winuniv.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-gtk.obj:     $(UNIVTHEMEDIR)\gtk.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-metal.obj:     $(UNIVTHEMEDIR)\metal.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-########################################################
-# Common objects (always compiled)
-
-accesscmn.obj:     $(COMMDIR)\accesscmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-appbase.obj:     $(COMMDIR)\appbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-appcmn.obj:     $(COMMDIR)\appcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-artprov.obj:     $(COMMDIR)\artprov.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-artstd.obj:     $(COMMDIR)\artstd.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-clntdata.obj:     $(COMMDIR)\clntdata.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-cmdline.obj:     $(COMMDIR)\cmdline.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-cmdproc.obj:     $(COMMDIR)\cmdproc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-cmndata.obj:     $(COMMDIR)\cmndata.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-config.obj:     $(COMMDIR)\config.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-containr.obj:     $(COMMDIR)\containr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-cshelp.obj:     $(COMMDIR)\cshelp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-datacmn.obj:     $(COMMDIR)\datacmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-datetime.obj:     $(COMMDIR)\datetime.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-datstrm.obj:     $(COMMDIR)\datstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-db.obj:     $(COMMDIR)\db.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dbgrid.obj:     $(COMMDIR)\dbgrid.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dbtable.obj:     $(COMMDIR)\dbtable.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcbase.obj:     $(COMMDIR)\dcbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dircmn.obj:     $(COMMDIR)\dircmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dndcmn.obj:     $(COMMDIR)\dndcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dobjcmn.obj:     $(COMMDIR)\dobjcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-docmdi.obj:     $(COMMDIR)\docmdi.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-docview.obj:     $(COMMDIR)\docview.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dpycmn.obj:     $(COMMDIR)\dpycmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dynarray.obj:     $(COMMDIR)\dynarray.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dynlib.obj:     $(COMMDIR)\dynlib.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dynload.obj:     $(COMMDIR)\dynload.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-effects.obj:     $(COMMDIR)\effects.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-encconv.obj:     $(COMMDIR)\encconv.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-event.obj:     $(COMMDIR)\event.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-fddlgcmn.obj:     $(COMMDIR)\fddlgcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-ffile.obj:     $(COMMDIR)\ffile.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-file.obj:     $(COMMDIR)\file.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fileconf.obj:     $(COMMDIR)\fileconf.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-filefn.obj:     $(COMMDIR)\filefn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-filename.obj:     $(COMMDIR)\filename.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-filesys.obj:     $(COMMDIR)\filesys.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fldlgcmn.obj:     $(COMMDIR)\fldlgcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fmapbase.obj:     $(COMMDIR)\fmapbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontmap.obj:     $(COMMDIR)\fontmap.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-framecmn.obj:     $(COMMDIR)\framecmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fs_mem.obj:     $(COMMDIR)\fs_mem.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-ftp.obj:     $(COMMDIR)\ftp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gaugecmn.obj:     $(COMMDIR)\gaugecmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-geometry.obj:     $(COMMDIR)\geometry.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-hash.obj:     $(COMMDIR)\hash.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-hashmap.obj:     $(COMMDIR)\hashmap.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-helpbase.obj:     $(COMMDIR)\helpbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-http.obj:     $(COMMDIR)\http.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagall.obj:     $(COMMDIR)\imagall.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-image.obj:     $(COMMDIR)\image.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagfill.obj:     $(COMMDIR)\imagfill.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imaggif.obj:     $(COMMDIR)\imaggif.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagiff.obj:     $(COMMDIR)\imagiff.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagpcx.obj:     $(COMMDIR)\imagpcx.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagpng.obj:     $(COMMDIR)\imagpng.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagpnm.obj:     $(COMMDIR)\imagpnm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagtiff.obj:     $(COMMDIR)\imagtiff.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imagxpm.obj:     $(COMMDIR)\imagxpm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-intl.obj:     $(COMMDIR)\intl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-layout.obj:     $(COMMDIR)\layout.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-lboxcmn.obj:     $(COMMDIR)\lboxcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-list.obj:     $(COMMDIR)\list.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-log.obj:     $(COMMDIR)\log.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-longlong.obj:     $(COMMDIR)\longlong.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-matrix.obj:     $(COMMDIR)\matrix.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-memory.obj:     $(COMMDIR)\memory.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-menucmn.obj:     $(COMMDIR)\menucmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-module.obj:     $(COMMDIR)\module.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-msgout.obj:     $(COMMDIR)\msgout.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-mstream.obj:     $(COMMDIR)\mstream.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-object.obj:     $(COMMDIR)\object.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-paper.obj:     $(COMMDIR)\paper.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-popupcmn.obj:     $(COMMDIR)\popupcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-prntbase.obj:     $(COMMDIR)\prntbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-process.obj:     $(COMMDIR)\process.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-protocol.obj:     $(COMMDIR)\protocol.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-quantize.obj:     $(COMMDIR)\quantize.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-regex.obj:     $(COMMDIR)\regex.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckfile.obj:     $(COMMDIR)\sckfile.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckipc.obj:     $(COMMDIR)\sckipc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-settcmn.obj:     $(COMMDIR)\settcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sizer.obj:     $(COMMDIR)\sizer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-socket.obj:     $(COMMDIR)\socket.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-statbar.obj:     $(COMMDIR)\statbar.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-stopwatch.obj:     $(COMMDIR)\stopwatch.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-strconv.obj:     $(COMMDIR)\strconv.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-stream.obj:     $(COMMDIR)\stream.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-string.obj:     $(COMMDIR)\string.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sysopt.obj:     $(COMMDIR)\sysopt.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-textbuf.obj:     $(COMMDIR)\textbuf.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-textcmn.obj:     $(COMMDIR)\textcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-textfile.obj:     $(COMMDIR)\textfile.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-timercmn.obj:     $(COMMDIR)\timercmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-toplvcmn.obj:     $(COMMDIR)\toplvcmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-treebase.obj:     $(COMMDIR)\treebase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-unzip.obj:     $(COMMDIR)\unzip.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-url.obj:     $(COMMDIR)\url.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-valgen.obj:     $(COMMDIR)\valgen.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-validate.obj:     $(COMMDIR)\validate.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-valtext.obj:     $(COMMDIR)\valtext.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-variant.obj:     $(COMMDIR)\variant.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-wfstream.obj:     $(COMMDIR)\wfstream.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-wincmn.obj:     $(COMMDIR)\wincmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-wxchar.obj:     $(COMMDIR)\wxchar.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-zstream.obj:     $(COMMDIR)\zstream.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
-
-#  *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-
-$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-
-########################################################
-# Generic objects (not always compiled, depending on
-# whether platforms have native implementations)
-
-accel.obj:     $(GENDIR)\accel.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-busyinfo.obj:     $(GENDIR)\busyinfo.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-calctrl.obj:     $(GENDIR)\calctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-caret.obj:     $(GENDIR)\caret.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-choicdgg.obj:     $(GENDIR)\choicdgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-colrdlgg.obj:     $(GENDIR)\colrdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dcpsg.obj:     $(GENDIR)\dcpsg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dirctrlg.obj:     $(GENDIR)\dirctrlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dirdlgg.obj:     $(GENDIR)\dirdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dragimgg.obj:     $(GENDIR)\dragimgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fdrepdlg.obj:     $(GENDIR)\fdrepdlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-filedlgg.obj:     $(GENDIR)\filedlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-grid.obj:     $(GENDIR)\grid.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gridctrl.obj:     $(GENDIR)\gridctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-gridsel.obj:     $(GENDIR)\gridsel.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-helpext.obj:     $(GENDIR)\helpext.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-imaglist.obj:     $(GENDIR)\imaglist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-laywin.obj:     $(GENDIR)\laywin.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-listctrl.obj:     $(GENDIR)\listctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-logg.obj:     $(GENDIR)\logg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-mdig.obj:     $(GENDIR)\mdig.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-numdlgg.obj:     $(GENDIR)\numdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-panelg.obj:     $(GENDIR)\panelg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-printps.obj:     $(GENDIR)\printps.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-progdlgg.obj:     $(GENDIR)\progdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sashwin.obj:     $(GENDIR)\sashwin.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-scrlwing.obj:     $(GENDIR)\scrlwing.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-selstore.obj:     $(GENDIR)\selstore.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-spinctlg.obj:     $(GENDIR)\spinctlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-splash.obj:     $(GENDIR)\splash.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-splitter.obj:     $(GENDIR)\splitter.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tabg.obj:     $(GENDIR)\tabg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-textdlgg.obj:     $(GENDIR)\textdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-timer.obj:     $(GENDIR)\timer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tipdlg.obj:     $(GENDIR)\tipdlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-tipwin.obj:     $(GENDIR)\tipwin.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-treectlg.obj:     $(GENDIR)\treectlg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-wizard.obj:     $(GENDIR)\wizard.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-
-########################################################
-# HTML objects (always compiled)
-
-helpctrl.obj:     $(HTMLDIR)\helpctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-helpdata.obj:     $(HTMLDIR)\helpdata.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-helpfrm.obj:     $(HTMLDIR)\helpfrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmlcell.obj:     $(HTMLDIR)\htmlcell.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmlfilt.obj:     $(HTMLDIR)\htmlfilt.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmlpars.obj:     $(HTMLDIR)\htmlpars.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmltag.obj:     $(HTMLDIR)\htmltag.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmlwin.obj:     $(HTMLDIR)\htmlwin.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-htmprint.obj:     $(HTMLDIR)\htmprint.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_dflist.obj:     $(HTMLDIR)\m_dflist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_fonts.obj:     $(HTMLDIR)\m_fonts.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_hline.obj:     $(HTMLDIR)\m_hline.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_image.obj:     $(HTMLDIR)\m_image.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_layout.obj:     $(HTMLDIR)\m_layout.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_links.obj:     $(HTMLDIR)\m_links.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_list.obj:     $(HTMLDIR)\m_list.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_pre.obj:     $(HTMLDIR)\m_pre.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_style.obj:     $(HTMLDIR)\m_style.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-m_tables.obj:     $(HTMLDIR)\m_tables.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-winpars.obj:     $(HTMLDIR)\winpars.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-
-
-
-png:   .SYMBOLIC
-    cd $(WXDIR)\src\png
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\mgl
-
-clean_png:   .SYMBOLIC
-    cd $(WXDIR)\src\png
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\mgl
-
-zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\mgl
-
-clean_zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\mgl
-
-jpeg:    .SYMBOLIC
-    cd $(WXDIR)\src\jpeg
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\mgl
-
-clean_jpeg:   .SYMBOLIC
-    cd $(WXDIR)\src\jpeg
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\mgl
-
-tiff:    .SYMBOLIC
-    cd $(WXDIR)\src\tiff
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\mgl
-
-clean_tiff:   .SYMBOLIC
-    cd $(WXDIR)\src\tiff
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\mgl
-
-regex:    .SYMBOLIC
-    cd $(WXDIR)\src\regex
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\mgl
-
-clean_regex:   .SYMBOLIC
-    cd $(WXDIR)\src\regex
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\mgl
-
-MFTYPE=watmgl
-self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
-       cd $(WXDIR)\distrib\msw\tmake
-       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXDIR)\src\mgl

diff --git a/src/mgl/makeprog.wat b/src/mgl/makeprog.wat
deleted file mode 100644 (file)
index 46a2427..0000000
--- a/src/mgl/makeprog.wat
+++ /dev/null
@@ -1,35 +0,0 @@
-WXDIR = $(%WXWIN)
-
-!include $(WXDIR)\src\mgl\makewat.env
-
-WXLIB = $(WXDIR)\lib
-LNK = $(PROGRAM).lnk
-
-all: $(PROGRAM).exe $(EXTRATARGETS)
-
-$(PROGRAM).exe : $(OBJECTS) $(LNK) $(WXLIB)\wx.lib
-    wlink @$(LNK)
-
-$(LNK) : makefile.wat
-    %create $(LNK)
-    @%append $(LNK) debug all
-    @%append $(LNK) system $(LINKOPTION)
-    @%append $(LNK) $(STACK)
-    @%append $(LNK) name $(PROGRAM).exe
-    @for %i in ($(OBJECTS)) do @%append $(LNK) file %i
-    @for %i in ($(LIBS)) do @%append $(LNK) lib %i
-    @for %i in ($(EXTRALIBS)) do @%append $(LNK) lib %i
-#    @%append $(LNK) $(MINDATA)
-#    @%append $(LNK) $(MAXDATA)
-
-clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase *.lib
-    -erase $(LNK)
-    -erase *.res
-    -erase *.exe
-    -erase *.lbc
-

diff --git a/src/mgl/makewat.env b/src/mgl/makewat.env
deleted file mode 100644 (file)
index c80a02f..0000000
--- a/src/mgl/makewat.env
+++ /dev/null
@@ -1,94 +0,0 @@
-# Purpose:      Watcom environments for wxWindows makefiles.
-# Author:       Julian Smart and others
-#
-# The main things to change are:
-#
-#   WATCOM:    set to where the compiler is installed
-#   WXDIR:     set to where the wxWindows is installed
-
-FINAL=0
-
-WATCOMVERSION
-
-WATCOMDIR=$(%WATCOM)
-MGLROOT=$(%MGL_ROOT)
-!ifeq FINAL 1
-MGLLIBDIR=$(MGLROOT)\lib\release\dos32\wc11
-!else
-MGLLIBDIR=$(MGLROOT)\lib\debug\dos32\wc11
-!endif
-
-
-.EXTENSIONS:
-.EXTENSIONS: .exe .obj .c .cc .cpp .res .rc .def
-
-WXDIR = $(%WXWIN)
-WXINC = $(WXDIR)\include
-
-# Suffixes
-OBJSUFF=obj
-SRCSUFF=cpp
-
-WXDEBUG=0
-
-!ifneq NOPRECOMP 1
-PRECOMP     = /fh=$(WXDIR)\src\mgl\watcom.pch
-!endif
-
-!ifeq FINAL 0
-DEBUGFLAGS     = /D__WXDEBUG__ /d2
-DEBUGINFO   = debug all
-ARCHINCDIR=$(WXDIR)\lib\mgld
-!else
-DEBUGFLAGS     =
-DEBUGINFO   =
-ARCHINCDIR=$(WXDIR)\lib\mgl
-!endif
-
-LEVEL       = 386
-CCC         = wpp$(LEVEL)
-CC         =  wcc$(LEVEL)
-OS_TARGET   = dos4g
-MODEL       =
-LINKOPTION  = dos4g
-BINDCOMMAND = wrc
-WATLIBDIR   = $(WATCOMDIR)\lib386\dos
-MINDATA     =
-MAXDATA     =
-STACK       = option stack=200k
-LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
-      $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  
-IFLAGS      = -i=$(ARCHINCDIR);$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
-;$(MGLROOT)\include
-
-# Here are some possible optimization flags:
-# /5r  Pentium timings
-# /fp5 /fpi87 Inline 80x87 instructions optimized for Pentium: coprocessor must be present
-# /ox  Standard optimizations
-# /or  Reordering for Pentium timings (included in /ox)
-# The Watcom-recommended flags for optimum Pentium speed are:
-# /oneatx /zp4 /5 /fpi87 /fp5
-
-OPTFLAGS=/ox /5r
-
-# /d1 for line numbers only: anything else produces an enormous wx32.lib
-#
-CPPFLAGS    = /bt=dos4g /w1 /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) $(DEBUGFLAGS) /d__WXMGL__ /d__WXUNIVERSAL__ /d__DOS__ $(EXTRACPPFLAGS) # /d__WATCOMC__
-
-.cpp.obj: # $< # .AUTODEPEND
-    *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-.c.obj: # $< # .AUTODEPEND
-    *$(CC) $(CPPFLAGS) $(IFLAGS) $<
-
-# This doesn't work for wcc
-#    %create tmp.lbc
-#    @%append tmp.lbc $(CPPFLAGS) $(IFLAGS) $<
-#    echo $<
-#    $(CC) @tmp.lbc
-
-dummy:  .SYMBOLIC
-    @echo Please give a target for wxWin makefiles: the usual one is 'all'.
-
-erasepch:   .SYMBOLIC
-    -erase $(WXDIR)\src\mgl\watcom.pch

diff --git a/src/msw/makebase.wat b/src/msw/makebase.wat
deleted file mode 100644 (file)
index b3cccff..0000000
--- a/src/msw/makebase.wat
+++ /dev/null
@@ -1,412 +0,0 @@
-#!/binb/wmake.exe
-
-# This file was automatically generated by tmake 
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WATBASE.T!
-
-##############################################################################
-# Name:         makebase.wat
-# Purpose:      Builds wxBase library for Watcom C++ under Win32
-# Author:       Vadim Zeitlin
-# Created:      21.01.03
-# RCS-ID:       $Id$
-# Copyright:    (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-# Licence:      wxWindows licence
-##############################################################################
-
-wxUSE_GUI=0
-
-!include ..\makewat.env
-
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBUGSUFFIX)_w.lib
-
-EXTRATARGETS = zlib regex
-EXTRATARGETSCLEAN = clean_zlib clean_regex
-COMMDIR=$(WXDIR)\src\common
-MSWDIR=$(WXDIR)\src\msw
-OLEDIR=$(MSWDIR)\ole
-
-COMMONOBJS = &
-       $(OUTPUTDIR)\appcmn.obj &
-       $(OUTPUTDIR)\clntdata.obj &
-       $(OUTPUTDIR)\cmdline.obj &
-       $(OUTPUTDIR)\config.obj &
-       $(OUTPUTDIR)\datetime.obj &
-       $(OUTPUTDIR)\datstrm.obj &
-       $(OUTPUTDIR)\db.obj &
-       $(OUTPUTDIR)\dbtable.obj &
-       $(OUTPUTDIR)\dircmn.obj &
-       $(OUTPUTDIR)\dynarray.obj &
-       $(OUTPUTDIR)\dynlib.obj &
-       $(OUTPUTDIR)\dynload.obj &
-       $(OUTPUTDIR)\encconv.obj &
-       $(OUTPUTDIR)\event.obj &
-       $(OUTPUTDIR)\extended.obj &
-       $(OUTPUTDIR)\ffile.obj &
-       $(OUTPUTDIR)\file.obj &
-       $(OUTPUTDIR)\fileconf.obj &
-       $(OUTPUTDIR)\filefn.obj &
-       $(OUTPUTDIR)\filename.obj &
-       $(OUTPUTDIR)\filesys.obj &
-       $(OUTPUTDIR)\fontmap.obj &
-       $(OUTPUTDIR)\fs_inet.obj &
-       $(OUTPUTDIR)\fs_mem.obj &
-       $(OUTPUTDIR)\fs_zip.obj &
-       $(OUTPUTDIR)\ftp.obj &
-       $(OUTPUTDIR)\hash.obj &
-       $(OUTPUTDIR)\hashmap.obj &
-       $(OUTPUTDIR)\http.obj &
-       $(OUTPUTDIR)\intl.obj &
-       $(OUTPUTDIR)\ipcbase.obj &
-       $(OUTPUTDIR)\list.obj &
-       $(OUTPUTDIR)\log.obj &
-       $(OUTPUTDIR)\longlong.obj &
-       $(OUTPUTDIR)\memory.obj &
-       $(OUTPUTDIR)\mimecmn.obj &
-       $(OUTPUTDIR)\module.obj &
-       $(OUTPUTDIR)\msgout.obj &
-       $(OUTPUTDIR)\mstream.obj &
-       $(OUTPUTDIR)\object.obj &
-       $(OUTPUTDIR)\process.obj &
-       $(OUTPUTDIR)\protocol.obj &
-       $(OUTPUTDIR)\regex.obj &
-       $(OUTPUTDIR)\sckaddr.obj &
-       $(OUTPUTDIR)\sckfile.obj &
-       $(OUTPUTDIR)\sckipc.obj &
-       $(OUTPUTDIR)\sckstrm.obj &
-       $(OUTPUTDIR)\socket.obj &
-       $(OUTPUTDIR)\strconv.obj &
-       $(OUTPUTDIR)\stream.obj &
-       $(OUTPUTDIR)\string.obj &
-       $(OUTPUTDIR)\sysopt.obj &
-       $(OUTPUTDIR)\textbuf.obj &
-       $(OUTPUTDIR)\textfile.obj &
-       $(OUTPUTDIR)\timercmn.obj &
-       $(OUTPUTDIR)\tokenzr.obj &
-       $(OUTPUTDIR)\txtstrm.obj &
-       $(OUTPUTDIR)\unzip.obj &
-       $(OUTPUTDIR)\url.obj &
-       $(OUTPUTDIR)\utilscmn.obj &
-       $(OUTPUTDIR)\variant.obj &
-       $(OUTPUTDIR)\wfstream.obj &
-       $(OUTPUTDIR)\wxchar.obj &
-       $(OUTPUTDIR)\zipstrm.obj &
-       $(OUTPUTDIR)\zstream.obj &
-       $(OUTPUTDIR)\init.obj
-
-MSWOBJS = &
-       $(OUTPUTDIR)\dde.obj &
-       $(OUTPUTDIR)\dir.obj &
-       $(OUTPUTDIR)\gsocket.obj &
-       $(OUTPUTDIR)\gsockmsw.obj &
-       $(OUTPUTDIR)\main.obj &
-       $(OUTPUTDIR)\mimetype.obj &
-       $(OUTPUTDIR)\regconf.obj &
-       $(OUTPUTDIR)\registry.obj &
-       $(OUTPUTDIR)\snglinst.obj &
-       $(OUTPUTDIR)\thread.obj &
-       $(OUTPUTDIR)\utils.obj &
-       $(OUTPUTDIR)\utilsexc.obj &
-       $(OUTPUTDIR)\volume.obj
-
-OBJECTS = $(COMMONOBJS) $(MSWOBJS)
-
-SETUP_H=$(ARCHINCDIR)\wx\setup.h
-
-all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
-
-$(ARCHINCDIR)\wx:
-       mkdir $(ARCHINCDIR)
-       mkdir $(ARCHINCDIR)\wx
-
-$(OUTPUTDIR):
-       mkdir $(OUTPUTDIR)
-
-$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
-       copy $(WXDIR)\include\wx\msw\setup.h $@
-
-LBCFILE=$(OUTPUTDIR)\wx$(TOOLKIT).lbc
-$(LIBTARGET) : $(OBJECTS)
-    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
-
-
-clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
-    -erase $(OUTPUTDIR)\*.obj
-    -erase $(LIBTARGET)
-    -erase $(OUTPUTDIR)\*.pch
-    -erase $(OUTPUTDIR)\*.err
-    -erase $(OUTPUTDIR)\*.lbc
-
-cleanall:   clean
-    -erase $(LBCFILE)
-
-$(OUTPUTDIR)\dde.obj:     $(MSWDIR)\dde.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dir.obj:     $(MSWDIR)\dir.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\gsocket.obj:     $(MSWDIR)\gsocket.c
-  *$(CC) $(CFLAGS) $<
-
-$(OUTPUTDIR)\gsockmsw.obj:     $(MSWDIR)\gsockmsw.c
-  *$(CC) $(CFLAGS) $<
-
-$(OUTPUTDIR)\main.obj:     $(MSWDIR)\main.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\mimetype.obj:     $(MSWDIR)\mimetype.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\regconf.obj:     $(MSWDIR)\regconf.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\registry.obj:     $(MSWDIR)\registry.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\snglinst.obj:     $(MSWDIR)\snglinst.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\thread.obj:     $(MSWDIR)\thread.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\utils.obj:     $(MSWDIR)\utils.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\volume.obj:     $(MSWDIR)\volume.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-
-
-########################################################
-# Common objects (always compiled)
-
-$(OUTPUTDIR)\appcmn.obj:     $(COMMDIR)\appcmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\clntdata.obj:     $(COMMDIR)\clntdata.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\cmdline.obj:     $(COMMDIR)\cmdline.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\config.obj:     $(COMMDIR)\config.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\datetime.obj:     $(COMMDIR)\datetime.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\datstrm.obj:     $(COMMDIR)\datstrm.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\db.obj:     $(COMMDIR)\db.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dbtable.obj:     $(COMMDIR)\dbtable.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dircmn.obj:     $(COMMDIR)\dircmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dynarray.obj:     $(COMMDIR)\dynarray.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dynlib.obj:     $(COMMDIR)\dynlib.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\dynload.obj:     $(COMMDIR)\dynload.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\encconv.obj:     $(COMMDIR)\encconv.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\event.obj:     $(COMMDIR)\event.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CFLAGS) $<
-
-$(OUTPUTDIR)\ffile.obj:     $(COMMDIR)\ffile.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\file.obj:     $(COMMDIR)\file.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\fileconf.obj:     $(COMMDIR)\fileconf.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\filefn.obj:     $(COMMDIR)\filefn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\filename.obj:     $(COMMDIR)\filename.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\filesys.obj:     $(COMMDIR)\filesys.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\fontmap.obj:     $(COMMDIR)\fontmap.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\fs_mem.obj:     $(COMMDIR)\fs_mem.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\ftp.obj:     $(COMMDIR)\ftp.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\hash.obj:     $(COMMDIR)\hash.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\hashmap.obj:     $(COMMDIR)\hashmap.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\http.obj:     $(COMMDIR)\http.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\intl.obj:     $(COMMDIR)\intl.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\list.obj:     $(COMMDIR)\list.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\log.obj:     $(COMMDIR)\log.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\longlong.obj:     $(COMMDIR)\longlong.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\memory.obj:     $(COMMDIR)\memory.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\module.obj:     $(COMMDIR)\module.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\msgout.obj:     $(COMMDIR)\msgout.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\mstream.obj:     $(COMMDIR)\mstream.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\object.obj:     $(COMMDIR)\object.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\process.obj:     $(COMMDIR)\process.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\protocol.obj:     $(COMMDIR)\protocol.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\regex.obj:     $(COMMDIR)\regex.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\sckfile.obj:     $(COMMDIR)\sckfile.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\sckipc.obj:     $(COMMDIR)\sckipc.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\socket.obj:     $(COMMDIR)\socket.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\strconv.obj:     $(COMMDIR)\strconv.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\stream.obj:     $(COMMDIR)\stream.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\string.obj:     $(COMMDIR)\string.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\sysopt.obj:     $(COMMDIR)\sysopt.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\textbuf.obj:     $(COMMDIR)\textbuf.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\textfile.obj:     $(COMMDIR)\textfile.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\timercmn.obj:     $(COMMDIR)\timercmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\unzip.obj:     $(COMMDIR)\unzip.c
-  *$(CC) $(CFLAGS) $<
-
-$(OUTPUTDIR)\url.obj:     $(COMMDIR)\url.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\variant.obj:     $(COMMDIR)\variant.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\wfstream.obj:     $(COMMDIR)\wfstream.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\wxchar.obj:     $(COMMDIR)\wxchar.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\zstream.obj:     $(COMMDIR)\zstream.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-$(OUTPUTDIR)\init.obj:     $(COMMDIR)\init.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
-
-
-zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\msw
-
-clean_zlib:   .SYMBOLIC
-    cd $(WXDIR)\src\zlib
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\msw
-
-regex:    .SYMBOLIC
-    cd $(WXDIR)\src\regex
-    wmake -f makefile.wat all
-    cd $(WXDIR)\src\msw
-
-clean_regex:   .SYMBOLIC
-    cd $(WXDIR)\src\regex
-    wmake -f makefile.wat clean
-    cd $(WXDIR)\src\msw
-
-MFTYPE=watbase
-self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
-       cd $(WXDIR)\distrib\msw\tmake
-       perl -S tmake -t $(MFTYPE) wxwin.pro -o makebase.wat
-       copy makebase.wat $(WXDIR)\src\msw

diff --git a/src/png/makefile.wat b/src/png/makefile.wat
deleted file mode 100644 (file)
index 8d5b967..0000000
--- a/src/png/makefile.wat
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/binb/wmake.exe
-#
-# File:                makefile.wat
-# Author:      Julian Smart
-# Created:     1998
-# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-#
-# Makefile : Builds PNG library for Watcom C++, WIN32
-
-WXDIR = ..\..
-EXTRACPPFLAGS=-i=..\zlib
-
-!include $(WXDIR)\src\makewat.env
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET = $(WXLIB)\png$(WATCOM_SUFFIX).lib
-
-OBJECTS = &
-    $(OUTPUTDIR)\png.obj &
-    $(OUTPUTDIR)\pngread.obj &
-    $(OUTPUTDIR)\pngrtran.obj &
-    $(OUTPUTDIR)\pngrutil.obj &
-    $(OUTPUTDIR)\pngpread.obj &
-    $(OUTPUTDIR)\pngtrans.obj &
-    $(OUTPUTDIR)\pngwrite.obj &
-    $(OUTPUTDIR)\pngwtran.obj &
-    $(OUTPUTDIR)\pngwutil.obj &
-    $(OUTPUTDIR)\pngerror.obj &
-    $(OUTPUTDIR)\pngmem.obj &
-    $(OUTPUTDIR)\pngwio.obj &
-    $(OUTPUTDIR)\pngrio.obj &
-    $(OUTPUTDIR)\pngget.obj &
-    $(OUTPUTDIR)\pngset.obj
-
-all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
-
-$(OUTPUTDIR):
-       @if not exist $^@ mkdir $^@
-
-LBCFILE=$(OUTPUTDIR)\png.lbc
-$(LIBTARGET) : $(OBJECTS)
-    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
-
-clean:   .SYMBOLIC
-    -erase $(OUTPUTDIR)\*.obj
-    -erase $(LIBTARGET)
-    -erase $(OUTPUTDIR)\*.pch
-    -erase $(OUTPUTDIR)\*.err
-    -erase $(OUTPUTDIR)\*.lbc
-
-cleanall:   clean
-

diff --git a/src/tiff/makefile.wat b/src/tiff/makefile.wat
deleted file mode 100644 (file)
index f847845..0000000
--- a/src/tiff/makefile.wat
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/binb/wmake.exe
-#
-# File:                makefile.wat
-# Author:      Julian Smart
-# Created:     1998
-# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
-#
-# Makefile : Builds TIFF library for Watcom C++, WIN32
-# This makefile has to rename files because apparently Watcom C++
-# can't deal with greater than 8.3 filenames (can't
-# make tif_close.c, for example)
-
-WXDIR = ..\..
-EXTRACPPFLAGS=-i=..\zlib
-
-!include $(WXDIR)\src\makewat.env
-
-# set RENAME to 1 to rename the files to the short names -- this is needed
-# with older Watcom versions
-# RENAME=1
-
-!ifeq RENAME 1
-TIFF=
-EXTRACPPFLAGS+=-dwxUSE_SHORTNAMES
-!else
-TIFF=tif_
-!endif
-
-WXLIB = $(WXDIR)\lib
-
-LIBTARGET = $(WXLIB)\tiff$(WATCOM_SUFFIX).lib
-
-OBJECTS= &
-!ifeq RENAME 1
-               $(OUTPUTDIR)\_aux.obj &
-!else
-               $(OUTPUTDIR)\tif_aux.obj &
-!endif
-               $(OUTPUTDIR)\$(TIFF)close.obj &
-               $(OUTPUTDIR)\$(TIFF)codec.obj &
-               $(OUTPUTDIR)\$(TIFF)compress.obj &
-               $(OUTPUTDIR)\$(TIFF)dir.obj &
-               $(OUTPUTDIR)\$(TIFF)dirinfo.obj &
-               $(OUTPUTDIR)\$(TIFF)dirread.obj &
-               $(OUTPUTDIR)\$(TIFF)dirwrite.obj &
-               $(OUTPUTDIR)\$(TIFF)dumpmode.obj &
-               $(OUTPUTDIR)\$(TIFF)error.obj &
-               $(OUTPUTDIR)\$(TIFF)fax3.obj &
-               $(OUTPUTDIR)\$(TIFF)fax3sm.obj &
-               $(OUTPUTDIR)\$(TIFF)flush.obj &
-               $(OUTPUTDIR)\$(TIFF)getimage.obj &
-               $(OUTPUTDIR)\$(TIFF)jpeg.obj &
-               $(OUTPUTDIR)\$(TIFF)luv.obj &
-               $(OUTPUTDIR)\$(TIFF)lzw.obj &
-               $(OUTPUTDIR)\$(TIFF)next.obj &
-               $(OUTPUTDIR)\$(TIFF)open.obj &
-               $(OUTPUTDIR)\$(TIFF)packbits.obj &
-               $(OUTPUTDIR)\$(TIFF)pixarlog.obj &
-               $(OUTPUTDIR)\$(TIFF)predict.obj &
-               $(OUTPUTDIR)\$(TIFF)print.obj &
-               $(OUTPUTDIR)\$(TIFF)read.obj &
-               $(OUTPUTDIR)\$(TIFF)strip.obj &
-               $(OUTPUTDIR)\$(TIFF)swab.obj &
-               $(OUTPUTDIR)\$(TIFF)thunder.obj &
-               $(OUTPUTDIR)\$(TIFF)tile.obj &
-               $(OUTPUTDIR)\$(TIFF)version.obj &
-               $(OUTPUTDIR)\$(TIFF)warning.obj &
-               $(OUTPUTDIR)\$(TIFF)win32.obj &
-               $(OUTPUTDIR)\$(TIFF)write.obj &
-               $(OUTPUTDIR)\$(TIFF)zip.obj
-
-all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC
-
-!ifeq RENAME 1
-rename: .SYMBOLIC
-               copy tif_predict.h tif_pred.h
-               copy tif_aux.c _aux.c 
-               copy tif_close.c close.c 
-               copy tif_codec.c codec.c 
-               copy tif_compress.c compress.c 
-               copy tif_dir.c dir.c 
-               copy tif_dirinfo.c dirinfo.c 
-               copy tif_dirread.c dirread.c 
-               copy tif_dirwrite.c dirwrite.c 
-               copy tif_dumpmode.c dumpmode.c 
-               copy tif_error.c error.c 
-               copy tif_fax3.c fax3.c 
-               copy tif_fax3sm.c fax3sm.c 
-               copy tif_flush.c flush.c 
-               copy tif_getimage.c getimage.c 
-               copy tif_jpeg.c jpeg.c 
-               copy tif_luv.c luv.c 
-               copy tif_lzw.c lzw.c 
-               copy tif_next.c next.c 
-               copy tif_open.c open.c 
-               copy tif_packbits.c packbits.c 
-               copy tif_pixarlog.c pixarlog.c 
-               copy tif_predict.c predict.c 
-               copy tif_print.c print.c 
-               copy tif_read.c read.c 
-               copy tif_strip.c strip.c 
-               copy tif_swab.c swab.c 
-               copy tif_thunder.c thunder.c 
-               copy tif_tile.c tile.c 
-               copy tif_version.c version.c 
-               copy tif_warning.c warning.c 
-               copy tif_win32.c win32.c 
-               copy tif_write.c write.c 
-               copy tif_zip.c zip.c
-!endif
-
-$(OUTPUTDIR):
-       @if not exist $^@ mkdir $^@
-
-LBCFILE=$(OUTPUTDIR)\tiff.lbc
-$(LIBTARGET) : $(OBJECTS)
-    %create $(LBCFILE)
-    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
-
-clean:   .SYMBOLIC
-    -erase *.obj
-    -erase $(LIBTARGET)
-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
-!ifeq RENAME 1
-       -erase tif_pred.h
-       -erase _aux.c 
-       -erase close.c 
-       -erase codec.c 
-       -erase compress.c 
-       -erase dir.c 
-       -erase dirinfo.c 
-       -erase dirread.c 
-       -erase dirwrite.c 
-       -erase dumpmode.c 
-       -erase error.c 
-       -erase fax3.c 
-       -erase fax3sm.c 
-       -erase flush.c 
-       -erase getimage.c 
-       -erase jpeg.c 
-       -erase luv.c 
-       -erase lzw.c 
-       -erase next.c 
-       -erase open.c 
-       -erase packbits.c 
-       -erase pixarlog.c 
-       -erase predict.c 
-       -erase print.c 
-       -erase read.c 
-       -erase strip.c 
-       -erase swab.c 
-       -erase thunder.c 
-       -erase tile.c 
-       -erase version.c 
-       -erase warning.c 
-       -erase win32.c 
-       -erase write.c 
-       -erase zip.c
-!endif
-
-cleanall:   clean
-