]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.g95
implemented menu drawing in the GTK theme
[wxWidgets.git] / src / msw / makefile.g95
index deff283a4f5462e28241b71ddd8771694abf674e..f0b9403606b407a9b1962c38ae760ecafc38a5d6 100644 (file)
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
+
 #
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "@(#)makefile.unx    1.2 5/9/94"
+# File:     makefile.g95
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
 #
 # Makefile for libwx.a
 
 # Replace this with your own path if necessary
 WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
+# All common compiler flags and options are now in
 # this central makefile.
 include $(WXDIR)/src/makeg95.env
 
-# IMPORTANT: if you want to link in subsidiary libraries,
-# required for some optional parts of wxWindows, you must
-# set EXTRATARGETS and EXTRAOBJS to match the settings in wx_setup.h.
-# Having done this, you won't have to worry about linking them
-# into each application.
-#
-# Here's the full list.
-#   prologio: Required if using the wxWindows resource facility
-#               USE_WX_RESOURCES should be 1
-#   xmgauge:  Gauge class (required for Motif only)
-#               USE_GAUGE should be 1
-#   xpm:      XPM pixmap support
-#               USE_XPM_IN_X should be 1
-#   wxstring: string class
-#               USE_GNU_WXSTRING should be 1
-#
-# Unfortunately, 'ar' doesn't like combining objects and libraries,
-# so we must identify all the objects from the subordinate libraries. Yuck!
-XPMSRC=../../contrib/wxxpm/objects$(GUISUFFIX)
-XPMOBJS=$(XPMSRC)/crbuffri.$(OBJSUFF) $(XPMSRC)/crbuffrp.$(OBJSUFF) $(XPMSRC)/crdatfri.$(OBJSUFF) $(XPMSRC)/crdatfrp.$(OBJSUFF)\
-  $(XPMSRC)/create.$(OBJSUFF) $(XPMSRC)/crifrbuf.$(OBJSUFF) $(XPMSRC)/crifrdat.$(OBJSUFF) $(XPMSRC)/crpfrbuf.$(OBJSUFF) $(XPMSRC)/crpfrdat.$(OBJSUFF)\
-  $(XPMSRC)/data.$(OBJSUFF) $(XPMSRC)/hashtab.$(OBJSUFF) $(XPMSRC)/misc.$(OBJSUFF) $(XPMSRC)/parse.$(OBJSUFF) $(XPMSRC)/rdftodat.$(OBJSUFF)\
-  $(XPMSRC)/rdftoi.$(OBJSUFF) $(XPMSRC)/rdftop.$(OBJSUFF) $(XPMSRC)/rgb.$(OBJSUFF) $(XPMSRC)/scan.$(OBJSUFF) $(XPMSRC)/simx.$(OBJSUFF)\
-  $(XPMSRC)/wrffrdat.$(OBJSUFF) $(XPMSRC)/wrffri.$(OBJSUFF) $(XPMSRC)/wrffrp.$(OBJSUFF)
+# DLL Name, if building wxWindows as a DLL.
+ifdef WXMAKINGDLL
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
+                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
+                    $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+DLL_LDFLAGS = -L$(WXDIR)/lib
+DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
+ifeq ($(wxUSE_GUI),0)
+  DLL_LDLIBS = $(DLL_BASE_LDLIBS)
+else
+  DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \
+              -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \
+               $(DLL_BASE_LDLIBS)
+endif
+endif
 
 # Subordinate library possibilities
 
 EXTRAOBJS=
 
-GENDIR=../generic
-COMMDIR=../common
-XPMDIR=../xpm
-OLEDIR=ole
-MSWDIR=.
-
-GENERICOBJDIR=../generic/$(OBJDIR)
-COMMOBJDIR=../common/$(OBJDIR)
-OLEOBJDIR=ole/$(OBJDIR)
-MSWDIR=$(OBJDIR)
-
-DOCDIR = $(WXDIR)\docs
-
-GENERICOBJS= \
-  $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/dirdlgg.$(OBJSUFF) \
-  $(GENDIR)/gridg.$(OBJSUFF) \
-  $(GENDIR)/laywin.$(OBJSUFF) \
-  $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/prop.$(OBJSUFF) \
-  $(GENDIR)/propform.$(OBJSUFF) \
-  $(GENDIR)/proplist.$(OBJSUFF) \
-  $(GENDIR)/sashwin.$(OBJSUFF) \
-  $(GENDIR)/scrolwin.$(OBJSUFF) \
-  $(GENDIR)/splitter.$(OBJSUFF) \
-  $(GENDIR)/statusbr.$(OBJSUFF) \
-  $(GENDIR)/tabg.$(OBJSUFF) \
-  $(GENDIR)/textdlgg.$(OBJSUFF)
-
-#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
-#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
-#  $(GENDIR)/printps.$(OBJSUFF) \
-#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
-
-COMMONOBJS = \
-  $(COMMDIR)/config.$(OBJSUFF) \
-  $(COMMDIR)/cmndata.$(OBJSUFF) \
-  $(COMMDIR)/docview.$(OBJSUFF) \
-  $(COMMDIR)/docmdi.$(OBJSUFF) \
-  $(COMMDIR)/dynarray.$(OBJSUFF) \
-  $(COMMDIR)/event.$(OBJSUFF) \
-  $(COMMDIR)/file.$(OBJSUFF) \
-  $(COMMDIR)/fileconf.$(OBJSUFF) \
-  $(COMMDIR)/filefn.$(OBJSUFF) \
-  $(COMMDIR)/framecmn.$(OBJSUFF) \
-  $(COMMDIR)/gdicmn.$(OBJSUFF) \
-  $(COMMDIR)/helpbase.$(OBJSUFF) \
-  $(COMMDIR)/image.$(OBJSUFF) \
-  $(COMMDIR)/intl.$(OBJSUFF) \
-  $(COMMDIR)/layout.$(OBJSUFF) \
-  $(COMMDIR)/log.$(OBJSUFF) \
-  $(COMMDIR)/memory.$(OBJSUFF) \
-  $(COMMDIR)/module.$(OBJSUFF) \
-  $(COMMDIR)/mimetype.$(OBJSUFF) \
-  $(COMMDIR)/object.$(OBJSUFF) \
-  $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/process.$(OBJSUFF) \
-  $(COMMDIR)/prntbase.$(OBJSUFF) \
-  $(COMMDIR)/resource.$(OBJSUFF) \
-  $(COMMDIR)/tbarbase.$(OBJSUFF) \
-  $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
-  $(COMMDIR)/textfile.$(OBJSUFF) \
-  $(COMMDIR)/timercmn.$(OBJSUFF) \
-  $(COMMDIR)/utilscmn.$(OBJSUFF) \
-  $(COMMDIR)/validate.$(OBJSUFF) \
-  $(COMMDIR)/valtext.$(OBJSUFF) \
-  $(COMMDIR)/date.$(OBJSUFF) \
-  $(COMMDIR)/wxexpr.$(OBJSUFF) \
-  $(COMMDIR)/hash.$(OBJSUFF) \
-  $(COMMDIR)/list.$(OBJSUFF) \
-  $(COMMDIR)/variant.$(OBJSUFF) \
-  $(COMMDIR)/string.$(OBJSUFF) \
-  $(COMMDIR)/time.$(OBJSUFF) \
-  $(COMMDIR)/tokenzr.$(OBJSUFF) \
-  $(COMMDIR)/y_tab.$(OBJSUFF) \
-  $(COMMDIR)/stream.$(OBJSUFF) \
-  $(COMMDIR)/wfstream.$(OBJSUFF) \
-  $(COMMDIR)/mstream.$(OBJSUFF) \
-  $(COMMDIR)/zstream.$(OBJSUFF) \
-  $(COMMDIR)/datstrm.$(OBJSUFF) \
-  $(COMMDIR)/objstrm.$(OBJSUFF) \
-  $(COMMDIR)/extended.$(OBJSUFF) \
-  $(COMMDIR)/wincmn.$(OBJSUFF)
-
-# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
-# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
-# Mingw32 may still have problems.
-#  $(COMMDIR)/socket.$(OBJSUFF) \
-#  $(COMMDIR)/sckaddr.$(OBJSUFF) \
-#  $(COMMDIR)/sckfile.$(OBJSUFF) \
-#  $(COMMDIR)/sckipc.$(OBJSUFF) \
-#  $(COMMDIR)/sckstrm.$(OBJSUFF) \
-#  $(COMMDIR)/protocol.$(OBJSUFF) \
-#  $(COMMDIR)/http.$(OBJSUFF) \
-#  $(COMMDIR)/ftp.$(OBJSUFF) \
-#  $(COMMDIR)/url.$(OBJSUFF) \
-
-MSWOBJS = \
-  accel.$(OBJSUFF) \
-  app.$(OBJSUFF) \
-  bitmap.$(OBJSUFF) \
-  bmpbuttn.$(OBJSUFF) \
-  brush.$(OBJSUFF) \
-  button.$(OBJSUFF) \
-  checkbox.$(OBJSUFF) \
-  checklst.$(OBJSUFF) \
-  choice.$(OBJSUFF) \
-  clipbrd.$(OBJSUFF) \
-  colordlg.$(OBJSUFF) \
-  colour.$(OBJSUFF) \
-  combobox.$(OBJSUFF) \
-  control.$(OBJSUFF) \
-  curico.$(OBJSUFF) \
-  cursor.$(OBJSUFF) \
-  data.$(OBJSUFF) \
-  dc.$(OBJSUFF) \
-  dcmemory.$(OBJSUFF) \
-  dcclient.$(OBJSUFF) \
-  dcprint.$(OBJSUFF) \
-  dcscreen.$(OBJSUFF) \
-  dde.$(OBJSUFF) \
-  dialog.$(OBJSUFF) \
-  dib.$(OBJSUFF) \
-  filedlg.$(OBJSUFF) \
-  font.$(OBJSUFF) \
-  fontdlg.$(OBJSUFF) \
-  frame.$(OBJSUFF) \
-  gaugemsw.$(OBJSUFF) \
-  gauge95.$(OBJSUFF) \
-  gdiobj.$(OBJSUFF) \
-  helpwin.$(OBJSUFF) \
-  icon.$(OBJSUFF) \
-  imaglist.$(OBJSUFF) \
-  joystick.$(OBJSUFF) \
-  listbox.$(OBJSUFF) \
-  listctrl.$(OBJSUFF) \
-  main.$(OBJSUFF) \
-  mdi.$(OBJSUFF) \
-  menu.$(OBJSUFF) \
-  menuitem.$(OBJSUFF) \
-  metafile.$(OBJSUFF) \
-  minifram.$(OBJSUFF) \
-  msgdlg.$(OBJSUFF) \
-  nativdlg.$(OBJSUFF) \
-  notebook.$(OBJSUFF) \
-  ownerdrw.$(OBJSUFF) \
-  palette.$(OBJSUFF) \
-  pen.$(OBJSUFF) \
-  penwin.$(OBJSUFF) \
-  printdlg.$(OBJSUFF) \
-  printwin.$(OBJSUFF) \
-  radiobox.$(OBJSUFF) \
-  radiobut.$(OBJSUFF) \
-  region.$(OBJSUFF) \
-  registry.$(OBJSUFF) \
-  regconf.$(OBJSUFF) \
-  scrolbar.$(OBJSUFF) \
-  settings.$(OBJSUFF) \
-  slidrmsw.$(OBJSUFF) \
-  slider95.$(OBJSUFF) \
-  spinbutt.$(OBJSUFF) \
-  statbmp.$(OBJSUFF) \
-  statbox.$(OBJSUFF) \
-  statbr95.$(OBJSUFF) \
-  stattext.$(OBJSUFF) \
-  tabctrl.$(OBJSUFF) \
-  taskbar.$(OBJSUFF) \
-  tbar95.$(OBJSUFF) \
-  tbarmsw.$(OBJSUFF) \
-  textctrl.$(OBJSUFF) \
-  thread.$(OBJSUFF) \
-  timer.$(OBJSUFF) \
-  treectrl.$(OBJSUFF) \
-  utils.$(OBJSUFF) \
-  utilsexc.$(OBJSUFF) \
-  wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
-  xpmhand.$(OBJSUFF)
-
-# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
-#  dirdlg.$(OBJSUFF) \
-
-# OLE not supported yet by GnuWin32
-#  $(OLEDIR)/droptgt.$(OBJSUFF) \
-#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-#  $(OLEDIR)/dataobj.$(OBJSUFF) \
-#  $(OLEDIR)/oleutils.$(OBJSUFF) \
-#  $(OLEDIR)/uuid.$(OBJSUFF) \
-#  $(OLEDIR)/automtn.$(OBJSUFF)
-
-XPMOBJECTS =   $(XPMDIR)/crbuffri.o\
-               $(XPMDIR)/crdatfri.o\
-               $(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
-               $(XPMDIR)/crifrdat.o\
-               $(XPMDIR)/data.o\
-               $(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
-               $(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
-               $(XPMDIR)/rdftoi.o\
-               $(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
-               $(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
-               $(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
-
-all:    $(OBJECTS) $(WXLIB)
-
-base:
-       cd $(WXDIR)/src/common; $(MAKE) -f makefile.g95 GUI=$(GUI) GUISUFFIX=$(GUISUFFIX) CC=$(CC)\
- OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+ZLIBDIR = $(WXDIR)/src/zlib
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+TIFFDIR = $(WXDIR)/src/tiff
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
+REGEXDIR= $(WXDIR)/src/regex
+
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+PNGLIB  = $(WXDIR)/lib/libpng.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+TIFFLIB = $(WXDIR)/lib/libtiff.a
+REGEXLIB= $(WXDIR)/lib/libregex.a
+
+DOCDIR = $(WXDIR)/docs
+
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+               DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+               DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+ifeq ($(wxUSE_GUI),0)
+  DIRDLGOBJ =
+endif
+
+GENERICOBJS_BASE = \
+
+GENERICOBJS = \
+                $(GENERICOBJS_BASE) \
+                $(GENDIR)/busyinfo.$(OBJSUFF) \
+               $(GENDIR)/calctrl.$(OBJSUFF) \
+               $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dcpsg.$(OBJSUFF) \
+               $(GENDIR)/dirctrlg.$(OBJSUFF) \
+               $(GENDIR)/dragimgg.$(OBJSUFF) \
+               $(GENDIR)/grid.$(OBJSUFF) \
+               $(GENDIR)/gridctrl.$(OBJSUFF) \
+               $(GENDIR)/gridsel.$(OBJSUFF) \
+               $(GENDIR)/laywin.$(OBJSUFF) \
+               $(GENDIR)/logg.$(OBJSUFF) \
+               $(GENDIR)/numdlgg.$(OBJSUFF) \
+               $(GENDIR)/panelg.$(OBJSUFF) \
+               $(GENDIR)/progdlgg.$(OBJSUFF) \
+               $(GENDIR)/prop.$(OBJSUFF) \
+               $(GENDIR)/propform.$(OBJSUFF) \
+               $(GENDIR)/proplist.$(OBJSUFF) \
+               $(GENDIR)/sashwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \
+               $(GENDIR)/spinctlg.$(OBJSUFF) \
+               $(GENDIR)/splash.$(OBJSUFF) \
+               $(GENDIR)/splitter.$(OBJSUFF) \
+               $(GENDIR)/statusbr.$(OBJSUFF) \
+               $(GENDIR)/tbarsmpl.$(OBJSUFF) \
+               $(GENDIR)/textdlgg.$(OBJSUFF) \
+               $(GENDIR)/tipdlg.$(OBJSUFF) \
+               $(GENDIR)/tipwin.$(OBJSUFF) \
+               $(GENDIR)/treectlg.$(OBJSUFF) \
+               $(GENDIR)/treelay.$(OBJSUFF) \
+               $(GENDIR)/wizard.$(OBJSUFF)
+
+COMMONOBJS_BASE  = \
+                $(COMMDIR)/appcmn.$(OBJSUFF) \
+               $(COMMDIR)/clntdata.$(OBJSUFF) \
+               $(COMMDIR)/cmdline.$(OBJSUFF) \
+               $(COMMDIR)/config.$(OBJSUFF) \
+               $(COMMDIR)/datetime.$(OBJSUFF) \
+               $(COMMDIR)/datstrm.$(OBJSUFF) \
+               $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbtable.$(OBJSUFF) \
+               $(COMMDIR)/dircmn.$(OBJSUFF) \
+               $(COMMDIR)/dynarray.$(OBJSUFF) \
+               $(COMMDIR)/dynlib.$(OBJSUFF) \
+               $(COMMDIR)/dynload.$(OBJSUFF) \
+               $(COMMDIR)/encconv.$(OBJSUFF) \
+               $(COMMDIR)/event.$(OBJSUFF) \
+               $(COMMDIR)/extended.$(OBJSUFF) \
+               $(COMMDIR)/ffile.$(OBJSUFF) \
+               $(COMMDIR)/file.$(OBJSUFF) \
+               $(COMMDIR)/fileconf.$(OBJSUFF) \
+               $(COMMDIR)/filefn.$(OBJSUFF) \
+               $(COMMDIR)/filename.$(OBJSUFF) \
+               $(COMMDIR)/filesys.$(OBJSUFF) \
+               $(COMMDIR)/fontmap.$(OBJSUFF) \
+               $(COMMDIR)/fs_inet.$(OBJSUFF) \
+               $(COMMDIR)/fs_mem.$(OBJSUFF) \
+               $(COMMDIR)/fs_zip.$(OBJSUFF) \
+               $(COMMDIR)/ftp.$(OBJSUFF) \
+               $(COMMDIR)/hash.$(OBJSUFF) \
+               $(COMMDIR)/hashmap.$(OBJSUFF) \
+               $(COMMDIR)/http.$(OBJSUFF) \
+               $(COMMDIR)/intl.$(OBJSUFF) \
+               $(COMMDIR)/ipcbase.$(OBJSUFF) \
+               $(COMMDIR)/list.$(OBJSUFF) \
+               $(COMMDIR)/log.$(OBJSUFF) \
+               $(COMMDIR)/longlong.$(OBJSUFF) \
+               $(COMMDIR)/memory.$(OBJSUFF) \
+               $(COMMDIR)/mimecmn.$(OBJSUFF) \
+               $(COMMDIR)/module.$(OBJSUFF) \
+               $(COMMDIR)/mstream.$(OBJSUFF) \
+               $(COMMDIR)/object.$(OBJSUFF) \
+               $(COMMDIR)/process.$(OBJSUFF) \
+               $(COMMDIR)/protocol.$(OBJSUFF) \
+               $(COMMDIR)/regex.$(OBJSUFF) \
+               $(COMMDIR)/sckaddr.$(OBJSUFF) \
+               $(COMMDIR)/sckfile.$(OBJSUFF) \
+               $(COMMDIR)/sckipc.$(OBJSUFF) \
+               $(COMMDIR)/sckstrm.$(OBJSUFF) \
+               $(COMMDIR)/socket.$(OBJSUFF) \
+               $(COMMDIR)/strconv.$(OBJSUFF) \
+               $(COMMDIR)/stream.$(OBJSUFF) \
+               $(COMMDIR)/string.$(OBJSUFF) \
+               $(COMMDIR)/sysopt.$(OBJSUFF) \
+               $(COMMDIR)/textbuf.$(OBJSUFF) \
+               $(COMMDIR)/textfile.$(OBJSUFF) \
+               $(COMMDIR)/timercmn.$(OBJSUFF) \
+               $(COMMDIR)/tokenzr.$(OBJSUFF) \
+               $(COMMDIR)/txtstrm.$(OBJSUFF) \
+               $(COMMDIR)/unzip.$(OBJSUFF) \
+               $(COMMDIR)/url.$(OBJSUFF) \
+               $(COMMDIR)/utilscmn.$(OBJSUFF) \
+               $(COMMDIR)/variant.$(OBJSUFF) \
+               $(COMMDIR)/wfstream.$(OBJSUFF) \
+               $(COMMDIR)/wxchar.$(OBJSUFF) \
+               $(COMMDIR)/zipstrm.$(OBJSUFF) \
+               $(COMMDIR)/zstream.$(OBJSUFF)
+
+COMMONOBJS_BASEONLY  = \
+                $(COMMDIR)/init.$(OBJSUFF)
+
+COMMONOBJS  = \
+                $(COMMONOBJS_BASE) \
+               $(COMMDIR)/y_tab.$(OBJSUFF) \
+               $(COMMDIR)/choiccmn.$(OBJSUFF) \
+               $(COMMDIR)/clipcmn.$(OBJSUFF) \
+               $(COMMDIR)/cmdproc.$(OBJSUFF) \
+               $(COMMDIR)/cmndata.$(OBJSUFF) \
+               $(COMMDIR)/containr.$(OBJSUFF) \
+               $(COMMDIR)/cshelp.$(OBJSUFF) \
+               $(COMMDIR)/ctrlcmn.$(OBJSUFF) \
+               $(COMMDIR)/ctrlsub.$(OBJSUFF) \
+               $(COMMDIR)/dbgrid.$(OBJSUFF) \
+               $(COMMDIR)/dcbase.$(OBJSUFF) \
+               $(COMMDIR)/dlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/dndcmn.$(OBJSUFF) \
+               $(COMMDIR)/dobjcmn.$(OBJSUFF) \
+               $(COMMDIR)/docmdi.$(OBJSUFF) \
+               $(COMMDIR)/docview.$(OBJSUFF) \
+               $(COMMDIR)/dseldlg.$(OBJSUFF) \
+               $(COMMDIR)/effects.$(OBJSUFF) \
+               $(COMMDIR)/fddlgcmn.$(OBJSUFF) \
+               $(COMMDIR)/fontcmn.$(OBJSUFF) \
+               $(COMMDIR)/framecmn.$(OBJSUFF) \
+               $(COMMDIR)/gaugecmn.$(OBJSUFF) \
+               $(COMMDIR)/gdicmn.$(OBJSUFF) \
+               $(COMMDIR)/geometry.$(OBJSUFF) \
+               $(COMMDIR)/gifdecod.$(OBJSUFF) \
+               $(COMMDIR)/helpbase.$(OBJSUFF) \
+               $(COMMDIR)/imagall.$(OBJSUFF) \
+               $(COMMDIR)/imagbmp.$(OBJSUFF) \
+               $(COMMDIR)/image.$(OBJSUFF) \
+               $(COMMDIR)/imaggif.$(OBJSUFF) \
+               $(COMMDIR)/imagiff.$(OBJSUFF) \
+               $(COMMDIR)/imagjpeg.$(OBJSUFF) \
+               $(COMMDIR)/imagpcx.$(OBJSUFF) \
+               $(COMMDIR)/imagpng.$(OBJSUFF) \
+               $(COMMDIR)/imagpnm.$(OBJSUFF) \
+               $(COMMDIR)/imagtiff.$(OBJSUFF) \
+               $(COMMDIR)/imagxpm.$(OBJSUFF) \
+               $(COMMDIR)/layout.$(OBJSUFF) \
+               $(COMMDIR)/lboxcmn.$(OBJSUFF) \
+               $(COMMDIR)/matrix.$(OBJSUFF) \
+               $(COMMDIR)/menucmn.$(OBJSUFF) \
+               $(COMMDIR)/nbkbase.$(OBJSUFF) \
+               $(COMMDIR)/paper.$(OBJSUFF) \
+               $(COMMDIR)/popupcmn.$(OBJSUFF) \
+               $(COMMDIR)/prntbase.$(OBJSUFF) \
+               $(COMMDIR)/quantize.$(OBJSUFF) \
+               $(COMMDIR)/radiocmn.$(OBJSUFF) \
+               $(COMMDIR)/resource.$(OBJSUFF) \
+               $(COMMDIR)/sizer.$(OBJSUFF) \
+               $(COMMDIR)/statbar.$(OBJSUFF) \
+               $(COMMDIR)/tbarbase.$(OBJSUFF) \
+               $(COMMDIR)/textcmn.$(OBJSUFF) \
+               $(COMMDIR)/toplvcmn.$(OBJSUFF) \
+               $(COMMDIR)/treebase.$(OBJSUFF) \
+               $(COMMDIR)/valgen.$(OBJSUFF) \
+               $(COMMDIR)/validate.$(OBJSUFF) \
+               $(COMMDIR)/valtext.$(OBJSUFF) \
+               $(COMMDIR)/wincmn.$(OBJSUFF) \
+               $(COMMDIR)/wxexpr.$(OBJSUFF) \
+               $(COMMDIR)/xpmdecod.$(OBJSUFF)
+
+HTMLOBJS = \
+                $(HTMLDIR)/helpctrl.$(OBJSUFF) \
+               $(HTMLDIR)/helpdata.$(OBJSUFF) \
+               $(HTMLDIR)/helpfrm.$(OBJSUFF) \
+               $(HTMLDIR)/htmlcell.$(OBJSUFF) \
+               $(HTMLDIR)/htmlfilt.$(OBJSUFF) \
+               $(HTMLDIR)/htmlpars.$(OBJSUFF) \
+               $(HTMLDIR)/htmltag.$(OBJSUFF) \
+               $(HTMLDIR)/htmlwin.$(OBJSUFF) \
+               $(HTMLDIR)/htmprint.$(OBJSUFF) \
+               $(HTMLDIR)/m_dflist.$(OBJSUFF) \
+               $(HTMLDIR)/m_fonts.$(OBJSUFF) \
+               $(HTMLDIR)/m_hline.$(OBJSUFF) \
+               $(HTMLDIR)/m_image.$(OBJSUFF) \
+               $(HTMLDIR)/m_layout.$(OBJSUFF) \
+               $(HTMLDIR)/m_links.$(OBJSUFF) \
+               $(HTMLDIR)/m_list.$(OBJSUFF) \
+               $(HTMLDIR)/m_meta.$(OBJSUFF) \
+               $(HTMLDIR)/m_pre.$(OBJSUFF) \
+               $(HTMLDIR)/m_style.$(OBJSUFF) \
+               $(HTMLDIR)/m_tables.$(OBJSUFF) \
+               $(HTMLDIR)/winpars.$(OBJSUFF)
+
+MSWOBJS_BASE = \
+                $(MSWDIR)/dde.$(OBJSUFF) \
+               $(MSWDIR)/dir.$(OBJSUFF) \
+               $(MSWDIR)/gsocket.$(OBJSUFF) \
+               $(MSWDIR)/gsockmsw.$(OBJSUFF) \
+               $(MSWDIR)/main.$(OBJSUFF) \
+               $(MSWDIR)/mimetype.$(OBJSUFF) \
+               $(MSWDIR)/regconf.$(OBJSUFF) \
+               $(MSWDIR)/registry.$(OBJSUFF) \
+               $(MSWDIR)/snglinst.$(OBJSUFF) \
+               $(MSWDIR)/thread.$(OBJSUFF) \
+               $(MSWDIR)/utils.$(OBJSUFF) \
+               $(MSWDIR)/utilsexc.$(OBJSUFF) \
+               $(MSWDIR)/volume.$(OBJSUFF)
+
+MSWOBJS     = \
+                $(MSWOBJS_BASE) \
+               $(MSWDIR)/accel.$(OBJSUFF) \
+               $(MSWDIR)/app.$(OBJSUFF) \
+               $(MSWDIR)/bitmap.$(OBJSUFF) \
+               $(MSWDIR)/bmpbuttn.$(OBJSUFF) \
+               $(MSWDIR)/brush.$(OBJSUFF) \
+               $(MSWDIR)/button.$(OBJSUFF) \
+               $(MSWDIR)/caret.$(OBJSUFF) \
+               $(MSWDIR)/checkbox.$(OBJSUFF) \
+               $(MSWDIR)/checklst.$(OBJSUFF) \
+               $(MSWDIR)/choice.$(OBJSUFF) \
+               $(MSWDIR)/clipbrd.$(OBJSUFF) \
+               $(MSWDIR)/colordlg.$(OBJSUFF) \
+               $(MSWDIR)/colour.$(OBJSUFF) \
+               $(MSWDIR)/combobox.$(OBJSUFF) \
+               $(MSWDIR)/control.$(OBJSUFF) \
+               $(MSWDIR)/curico.$(OBJSUFF) \
+               $(MSWDIR)/cursor.$(OBJSUFF) \
+               $(MSWDIR)/data.$(OBJSUFF) \
+               $(MSWDIR)/dc.$(OBJSUFF) \
+               $(MSWDIR)/dcclient.$(OBJSUFF) \
+               $(MSWDIR)/dcmemory.$(OBJSUFF) \
+               $(MSWDIR)/dcprint.$(OBJSUFF) \
+               $(MSWDIR)/dcscreen.$(OBJSUFF) \
+               $(MSWDIR)/dialog.$(OBJSUFF) \
+               $(MSWDIR)/dialup.$(OBJSUFF) \
+               $(MSWDIR)/dib.$(OBJSUFF) \
+               $(MSWDIR)/dibutils.$(OBJSUFF) \
+               $(MSWDIR)/dragimag.$(OBJSUFF) \
+               $(MSWDIR)/enhmeta.$(OBJSUFF) \
+               $(MSWDIR)/evtloop.$(OBJSUFF) \
+               $(MSWDIR)/fdrepdlg.$(OBJSUFF) \
+               $(MSWDIR)/filedlg.$(OBJSUFF) \
+               $(MSWDIR)/font.$(OBJSUFF) \
+               $(MSWDIR)/fontdlg.$(OBJSUFF) \
+               $(MSWDIR)/fontenum.$(OBJSUFF) \
+               $(MSWDIR)/fontutil.$(OBJSUFF) \
+               $(MSWDIR)/frame.$(OBJSUFF) \
+               $(MSWDIR)/gauge95.$(OBJSUFF) \
+               $(MSWDIR)/gdiimage.$(OBJSUFF) \
+               $(MSWDIR)/gdiobj.$(OBJSUFF) \
+               $(MSWDIR)/glcanvas.$(OBJSUFF) \
+               $(MSWDIR)/helpbest.$(OBJSUFF) \
+               $(MSWDIR)/helpchm.$(OBJSUFF) \
+               $(MSWDIR)/helpwin.$(OBJSUFF) \
+               $(MSWDIR)/icon.$(OBJSUFF) \
+               $(MSWDIR)/imaglist.$(OBJSUFF) \
+               $(MSWDIR)/joystick.$(OBJSUFF) \
+               $(MSWDIR)/listbox.$(OBJSUFF) \
+               $(MSWDIR)/listctrl.$(OBJSUFF) \
+               $(MSWDIR)/mdi.$(OBJSUFF) \
+               $(MSWDIR)/menu.$(OBJSUFF) \
+               $(MSWDIR)/menuitem.$(OBJSUFF) \
+               $(MSWDIR)/metafile.$(OBJSUFF) \
+               $(MSWDIR)/minifram.$(OBJSUFF) \
+               $(MSWDIR)/msgdlg.$(OBJSUFF) \
+               $(MSWDIR)/mslu.$(OBJSUFF) \
+               $(MSWDIR)/nativdlg.$(OBJSUFF) \
+               $(MSWDIR)/notebook.$(OBJSUFF) \
+               $(MSWDIR)/ownerdrw.$(OBJSUFF) \
+               $(MSWDIR)/palette.$(OBJSUFF) \
+               $(MSWDIR)/pen.$(OBJSUFF) \
+               $(MSWDIR)/penwin.$(OBJSUFF) \
+               $(MSWDIR)/printdlg.$(OBJSUFF) \
+               $(MSWDIR)/printwin.$(OBJSUFF) \
+               $(MSWDIR)/radiobox.$(OBJSUFF) \
+               $(MSWDIR)/radiobut.$(OBJSUFF) \
+               $(MSWDIR)/region.$(OBJSUFF) \
+               $(MSWDIR)/scrolbar.$(OBJSUFF) \
+               $(MSWDIR)/settings.$(OBJSUFF) \
+               $(MSWDIR)/slider95.$(OBJSUFF) \
+               $(MSWDIR)/spinbutt.$(OBJSUFF) \
+               $(MSWDIR)/spinctrl.$(OBJSUFF) \
+               $(MSWDIR)/statbmp.$(OBJSUFF) \
+               $(MSWDIR)/statbox.$(OBJSUFF) \
+               $(MSWDIR)/statbr95.$(OBJSUFF) \
+               $(MSWDIR)/statline.$(OBJSUFF) \
+               $(MSWDIR)/stattext.$(OBJSUFF) \
+               $(MSWDIR)/tabctrl.$(OBJSUFF) \
+               $(MSWDIR)/taskbar.$(OBJSUFF) \
+               $(MSWDIR)/tbar95.$(OBJSUFF) \
+               $(MSWDIR)/textctrl.$(OBJSUFF) \
+               $(MSWDIR)/tglbtn.$(OBJSUFF) \
+               $(MSWDIR)/timer.$(OBJSUFF) \
+               $(MSWDIR)/tooltip.$(OBJSUFF) \
+               $(MSWDIR)/toplevel.$(OBJSUFF) \
+               $(MSWDIR)/treectrl.$(OBJSUFF) \
+               $(MSWDIR)/wave.$(OBJSUFF) \
+               $(MSWDIR)/window.$(OBJSUFF)
+
+ADVANCEDOBJS_BASE = \
+
+ADVANCEDOBJS     = \
+                $(ADVANCEDOBJS_BASE) \
+               $(COMMDIR)/odbc.$(OBJSUFF) \
+               $(MSWDIR)/ole/automtn.$(OBJSUFF) \
+               $(MSWDIR)/ole/dataobj.$(OBJSUFF) \
+               $(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
+               $(MSWDIR)/ole/droptgt.$(OBJSUFF) \
+               $(MSWDIR)/ole/oleutils.$(OBJSUFF) \
+               $(MSWDIR)/ole/uuid.$(OBJSUFF)
+
+ZLIBOBJS    = \
+               $(ZLIBDIR)/adler32.$(OBJSUFF) \
+               $(ZLIBDIR)/compress.$(OBJSUFF) \
+               $(ZLIBDIR)/crc32.$(OBJSUFF) \
+               $(ZLIBDIR)/gzio.$(OBJSUFF) \
+               $(ZLIBDIR)/uncompr.$(OBJSUFF) \
+               $(ZLIBDIR)/deflate.$(OBJSUFF) \
+               $(ZLIBDIR)/trees.$(OBJSUFF) \
+               $(ZLIBDIR)/zutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inflate.$(OBJSUFF) \
+               $(ZLIBDIR)/infblock.$(OBJSUFF) \
+               $(ZLIBDIR)/inftrees.$(OBJSUFF) \
+               $(ZLIBDIR)/infcodes.$(OBJSUFF) \
+               $(ZLIBDIR)/infutil.$(OBJSUFF) \
+               $(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+               $(PNGDIR)/png.$(OBJSUFF) \
+               $(PNGDIR)/pngread.$(OBJSUFF) \
+               $(PNGDIR)/pngrtran.$(OBJSUFF) \
+               $(PNGDIR)/pngrutil.$(OBJSUFF) \
+               $(PNGDIR)/pngpread.$(OBJSUFF) \
+               $(PNGDIR)/pngtrans.$(OBJSUFF) \
+               $(PNGDIR)/pngwrite.$(OBJSUFF) \
+               $(PNGDIR)/pngwtran.$(OBJSUFF) \
+               $(PNGDIR)/pngwutil.$(OBJSUFF) \
+               $(PNGDIR)/pngerror.$(OBJSUFF) \
+               $(PNGDIR)/pngmem.$(OBJSUFF) \
+               $(PNGDIR)/pngwio.$(OBJSUFF) \
+               $(PNGDIR)/pngrio.$(OBJSUFF) \
+               $(PNGDIR)/pngget.$(OBJSUFF) \
+               $(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+               $(JPEGDIR)/jcomapi.$(OBJSUFF) \
+               $(JPEGDIR)/jutils.$(OBJSUFF) \
+               $(JPEGDIR)/jerror.$(OBJSUFF) \
+               $(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+               $(JPEGDIR)/jcapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jcapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jctrans.$(OBJSUFF) \
+               $(JPEGDIR)/jcparam.$(OBJSUFF) \
+               $(JPEGDIR)/jdatadst.$(OBJSUFF) \
+               $(JPEGDIR)/jcinit.$(OBJSUFF) \
+               $(JPEGDIR)/jcmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jcmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jcmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jcprepct.$(OBJSUFF) \
+               $(JPEGDIR)/jccoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jccolor.$(OBJSUFF) \
+               $(JPEGDIR)/jcsample.$(OBJSUFF) \
+               $(JPEGDIR)/jchuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jfdctint.$(OBJSUFF) \
+               $(JPEGDIR)/jdapimin.$(OBJSUFF) \
+               $(JPEGDIR)/jdapistd.$(OBJSUFF) \
+               $(JPEGDIR)/jdtrans.$(OBJSUFF) \
+               $(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+               $(JPEGDIR)/jdmaster.$(OBJSUFF) \
+               $(JPEGDIR)/jdinput.$(OBJSUFF) \
+               $(JPEGDIR)/jdmarker.$(OBJSUFF) \
+               $(JPEGDIR)/jdhuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdphuff.$(OBJSUFF) \
+               $(JPEGDIR)/jdmainct.$(OBJSUFF) \
+               $(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+               $(JPEGDIR)/jdpostct.$(OBJSUFF) \
+               $(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+               $(JPEGDIR)/jidctfst.$(OBJSUFF) \
+               $(JPEGDIR)/jidctflt.$(OBJSUFF) \
+               $(JPEGDIR)/jidctint.$(OBJSUFF) \
+               $(JPEGDIR)/jidctred.$(OBJSUFF) \
+               $(JPEGDIR)/jdsample.$(OBJSUFF) \
+               $(JPEGDIR)/jdcolor.$(OBJSUFF) \
+               $(JPEGDIR)/jquant1.$(OBJSUFF) \
+               $(JPEGDIR)/jquant2.$(OBJSUFF) \
+               $(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+TIFFOBJS = $(TIFFDIR)/tif_aux.o \
+               $(TIFFDIR)/tif_close.o \
+               $(TIFFDIR)/tif_codec.o \
+               $(TIFFDIR)/tif_compress.o \
+               $(TIFFDIR)/tif_dir.o \
+               $(TIFFDIR)/tif_dirinfo.o \
+               $(TIFFDIR)/tif_dirread.o \
+               $(TIFFDIR)/tif_dirwrite.o \
+               $(TIFFDIR)/tif_dumpmode.o \
+               $(TIFFDIR)/tif_error.o \
+               $(TIFFDIR)/tif_fax3.o \
+               $(TIFFDIR)/tif_fax3sm.o \
+               $(TIFFDIR)/tif_flush.o \
+               $(TIFFDIR)/tif_getimage.o \
+               $(TIFFDIR)/tif_jpeg.o \
+               $(TIFFDIR)/tif_luv.o \
+               $(TIFFDIR)/tif_lzw.o \
+               $(TIFFDIR)/tif_next.o \
+               $(TIFFDIR)/tif_open.o \
+               $(TIFFDIR)/tif_packbits.o \
+               $(TIFFDIR)/tif_pixarlog.o \
+               $(TIFFDIR)/tif_predict.o \
+               $(TIFFDIR)/tif_print.o \
+               $(TIFFDIR)/tif_read.o \
+               $(TIFFDIR)/tif_strip.o \
+               $(TIFFDIR)/tif_swab.o \
+               $(TIFFDIR)/tif_thunder.o \
+               $(TIFFDIR)/tif_tile.o \
+               $(TIFFDIR)/tif_version.o \
+               $(TIFFDIR)/tif_warning.o \
+               $(TIFFDIR)/tif_win32.o \
+               $(TIFFDIR)/tif_write.o \
+               $(TIFFDIR)/tif_zip.o
+
+ifeq ($(MINGW32),1)
+  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
+endif
+ifeq ($(wxUSE_GUI),0)
+  OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
+endif
+
+# MBN: if anyone has a better solution for this kludge, step
+#      forward, *please*
+# this tests is we are on cygwin or not ( will _not_ work if you are using
+# ZSH on plain Win32, tought ); it uses the presence of "/"
+# in the PATH variable
+
+# how do you do "VAR=\" ? BLEAGH!
+BACKSLASH=$(subst a,\,a)
+ifeq (,$(findstring /,$(PATH)))
+  IS_CYGWIN=0
+  PATH_SEPARATOR:=$(BACKSLASH)
+  PATH_SUBST=/
+else
+  IS_CYGWIN=1
+  PATH_SEPARATOR=/
+  PATH_SUBST:=$(BACKSLASH)
+endif
+
+#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+ARCHINCDIR=$(WXDIR)/lib/$(TOOLKIT)$(INCEXT)
+
+SETUP_H=$(ARCHINCDIR)/wx/setup.h
+
+ifndef WXMAKINGDLL
+all:    $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB)
+else
+all:    $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL)
+endif
+
+$(ARCHINCDIR)/wx:
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
+       mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
+
+$(SETUP_H): $(ARCHINCDIR)/wx
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+
+#      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+
+ifndef WXMAKINGDLL
 
 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
        ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
        $(RANLIB) $@
 
-#$(MSWOBJDIR):
-#      mkdir $(OBJDIR)
+else
+
+# The new linker is a few orders of magnitude faster than the old way
+# of creating DLLs.
+ifeq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
+
+$(WXDLL): $(OBJECTS) $(EXTRAOBJS)
+       $(CC) -shared -o $@ \
+         -Wl,--output-def,$(WXDEF) \
+         -Wl,--out-implib,$(WXLIB) \
+         $(OBJECTS) $(EXTRAOBJS) \
+         $(DLL_LDFLAGS) $(DLL_LDLIBS)
+else
+
+ifeq ($(MINGW32),1)
+  DLL_ENTRY = _DllMainCRTStartup@12
+else
+  DLL_ENTRY = __cygwin_dll_entry@12
+endif
+LD_STUFF = $(OBJECTS) $(EXTRAOBJS) -Wl,-e,$(DLL_ENTRY) \
+           $(DLL_LDFLAGS) $(DLL_LDLIBS) #-Wl,--image-base=0x66000000
+
+DLL_STUFF = --as=$(AS) --dllname $(notdir $(WXDLL)) \
+            --def $(WXDEF) \
+            --base-file wx.base --output-exp wx.exp
+
+$(WXDEF) $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+       $(DLLTOOL) --output-def $@ --output-lib $(WXLIB) \
+         --dllname $(notdir $(WXDLL)) \
+         $(OBJECTS) $(EXTRAOBJS) $(DLL_EXTRA_LIBS)
+
+$(WXDLL): $(OBJECTS) $(EXTRAOBJS) $(WXDEF)
+       $(CC) -mdll -Wl,--base-file,wx.base -s -o $@ $(LD_STUFF)
+       $(DLLTOOL) $(DLL_STUFF)
+       $(CC) -mdll -Wl,--base-file,wx.base wx.exp -s -o $@ $(LD_STUFF)
+       $(DLLTOOL) $(DLL_STUFF)
+       $(CC) -mdll wx.exp -o $@ $(LD_STUFF)
+       -$(RM) wx.base
+       -$(RM) wx.exp
+
+endif
+
+endif
+
+
+$(ZLIBLIB): $(ZLIBOBJS)
+       $(AR) $(AROPTIONS) $@ $(ZLIBOBJS)
+       $(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+       $(AR) $(AROPTIONS) $@ $(PNGOBJS)
+       $(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+       $(AR) $(AROPTIONS) $@ $(JPEGOBJS)
+       $(RANLIB) $@
 
-#$(COMMOBJDIR):
-#      mkdir $(COMMDIR)/$(OBJDIR)
+$(TIFFLIB): $(TIFFOBJS)
+       $(AR) $(AROPTIONS) $@ $(TIFFOBJS)
+       $(RANLIB) $@
 
-#$(GENERICOBJDIR):
-#      mkdir $(GENDIR)/$(OBJDIR)
+$(REGEXLIB):
+       $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
 
-$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+$(OBJECTS):    $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
-       $(CCLEX) -c $(CPPFLAGS) -o $@ $(COMMDIR)/y_tab.c
+       $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+       $(COPY) ../common/dosyacc.c ../common/y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+       $(COPY) ../common/doslex.c ../common/lex_yy.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
-$(COMMDIR)/lex_yy.c:   $(COMMDIR)/lexer.l
-       $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+# $(COMMDIR)/lex_yy.c: $(COMMDIR)/lexer.l
+#      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
 # Try one of these if the above line doesn't work.
 # Alternative syntax (1)
 #      $(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
 # Alternative syntax (2)
 #      $(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
-
+#
 #      sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #      sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
 #      rm -f lex.yy.c
-
+#
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.
-
-$(COMMDIR)/y_tab.c:    $(COMMDIR)/parser.y
-       $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
-
+#
+# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
+#      $(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
 # If you use e.g. gcc on Unix, uncomment these lines
 # and comment out the above.
-
-#$(COMMDIR)/y_tab.c:   $(COMMDIR)/parser.y
+#
+# $(COMMDIR)/y_tab.c:  $(COMMDIR)/parser.y
 #      $(YACC) $(COMMDIR)/parser.y
 #      mv y.tab.c $(COMMDIR)/y_tab.c
 
-# Extra targets
-rcparser:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
-       cd $(WXDIR)/src/msw
-
-clean_rcp:
-       cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
-       cd $(WXDIR)/src/msw
-
 clean:
-       rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core
+       -$(RM) *.o
+       -$(RM) ole/*.o
+       -$(RM) *.bak
+       -$(RM) core
+       -$(RM) ../common/y_tab.c
+       -$(RM) ../common/lex_yy.c
+       -$(RM) ../common/*.o
+       -$(RM) ../common/*.bak
+       -$(RM) ../generic/*.o
+       -$(RM) ../generic/*.bak
+       -$(RM) ../html/*.o
+       -$(RM) ../zlib/*.o
+       -$(RM) ../zlib/*.bak
+       -$(RM) ../png/*.o
+       -$(RM) ../png/*.bak
+       -$(RM) ../jpeg/*.o
+       -$(RM) ../jpeg/*.bak
+       -$(RM) ../tiff/*.o
+       -$(RM) ../tiff/*.bak
+       -$(RM) ../regex/*.o
+       -$(RM) ../regex/*.bak
 
 cleanall: clean
+       -$(RM) $(WXLIB)
+       -$(RM) $(ZLIBLIB)
+       -$(RM) $(PNGLIB)
+       -$(RM) $(JPEGLIB)
+       -$(RM) $(TIFFLIB)
+       -$(RM) $(REGEXLIB)
+
+ifdef WXMAKINGDLL
+       -$(RM) $(WXDLL)
+       -$(RM) $(WXDEF)
+ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes"
+       -$(RM) wx.base
+       -$(RM) wx.exp
+endif
+endif