]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/makefile.b32
create the DIBs in correct (and not down up) line order
[wxWidgets.git] / src / msw / makefile.b32
index d990bc3129d3099bd533c876ebf95ee0429bd37e..9e78bf3f839edaa26e8a425396f244fdb116b15e 100644 (file)
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake 
+# This file was automatically generated by tmake
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -15,9 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
@@ -26,6 +24,7 @@
 WXDIR = $(WXWIN)
 THISDIR = $(WXDIR)\src\msw
 
+
 # Set all these to 1 if you want to build a dynamic library
 !if "$(DLL)" == "1"
 WXMAKINGDLL=1
@@ -67,6 +66,8 @@ GENDIR=..\generic
 COMMDIR=..\common
 HTMLDIR=..\html
 OLEDIR=.\ole
+UNIVDIR=..\univ
+UNIVTHEMEDIR=..\univ\themes
 MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
@@ -103,19 +104,285 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
-# Not needed:
-#  $(MSWDIR)\colrdlgg.obj \
-#  $(MSWDIR)\fontdlgg.obj \
-#  $(MSWDIR)\msgdlgg.obj \
-#  $(MSWDIR)\printps.obj \
-#  $(MSWDIR)\prntdlgg.obj \
-#  $(MSWDIR)\listctrl.obj \
-#  $(MSWDIR)\notebook.obj \
-#  $(MSWDIR)\treectrl.obj
+MSWOBJS = $(MSWDIR)\accel.obj \
+               $(MSWDIR)\app.obj \
+               $(MSWDIR)\automtn.obj \
+               $(MSWDIR)\bitmap.obj \
+               $(MSWDIR)\bmpbuttn.obj \
+               $(MSWDIR)\brush.obj \
+               $(MSWDIR)\button.obj \
+               $(MSWDIR)\caret.obj \
+               $(MSWDIR)\checkbox.obj \
+               $(MSWDIR)\checklst.obj \
+               $(MSWDIR)\choice.obj \
+               $(MSWDIR)\clipbrd.obj \
+               $(MSWDIR)\colordlg.obj \
+               $(MSWDIR)\colour.obj \
+               $(MSWDIR)\combobox.obj \
+               $(MSWDIR)\control.obj \
+               $(MSWDIR)\curico.obj \
+               $(MSWDIR)\cursor.obj \
+               $(MSWDIR)\data.obj \
+               $(MSWDIR)\dataobj.obj \
+               $(MSWDIR)\dc.obj \
+               $(MSWDIR)\dcclient.obj \
+               $(MSWDIR)\dcmemory.obj \
+               $(MSWDIR)\dcprint.obj \
+               $(MSWDIR)\dcscreen.obj \
+               $(MSWDIR)\dde.obj \
+               $(MSWDIR)\dialog.obj \
+               $(MSWDIR)\dialup.obj \
+               $(MSWDIR)\dib.obj \
+               $(MSWDIR)\dir.obj \
+               $(MSWDIR)\dirdlg.obj \
+               $(MSWDIR)\dragimag.obj \
+               $(MSWDIR)\dropsrc.obj \
+               $(MSWDIR)\droptgt.obj \
+               $(MSWDIR)\enhmeta.obj \
+               $(MSWDIR)\evtloop.obj \
+               $(MSWDIR)\fdrepdlg.obj \
+               $(MSWDIR)\filedlg.obj \
+               $(MSWDIR)\font.obj \
+               $(MSWDIR)\fontdlg.obj \
+               $(MSWDIR)\fontenum.obj \
+               $(MSWDIR)\fontutil.obj \
+               $(MSWDIR)\frame.obj \
+               $(MSWDIR)\gauge95.obj \
+               $(MSWDIR)\gdiimage.obj \
+               $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\glcanvas.obj \
+               $(MSWDIR)\gsocket.obj \
+               $(MSWDIR)\gsockmsw.obj \
+               $(MSWDIR)\helpbest.obj \
+               $(MSWDIR)\helpchm.obj \
+               $(MSWDIR)\helpwin.obj \
+               $(MSWDIR)\icon.obj \
+               $(MSWDIR)\imaglist.obj \
+               $(MSWDIR)\iniconf.obj \
+               $(MSWDIR)\joystick.obj \
+               $(MSWDIR)\listbox.obj \
+               $(MSWDIR)\listctrl.obj \
+               $(MSWDIR)\main.obj \
+               $(MSWDIR)\mdi.obj \
+               $(MSWDIR)\menu.obj \
+               $(MSWDIR)\menuitem.obj \
+               $(MSWDIR)\metafile.obj \
+               $(MSWDIR)\mimetype.obj \
+               $(MSWDIR)\minifram.obj \
+               $(MSWDIR)\msgdlg.obj \
+               $(MSWDIR)\mslu.obj \
+               $(MSWDIR)\nativdlg.obj \
+               $(MSWDIR)\notebook.obj \
+               $(MSWDIR)\oleutils.obj \
+               $(MSWDIR)\ownerdrw.obj \
+               $(MSWDIR)\palette.obj \
+               $(MSWDIR)\pen.obj \
+               $(MSWDIR)\penwin.obj \
+               $(MSWDIR)\popupwin.obj \
+               $(MSWDIR)\printdlg.obj \
+               $(MSWDIR)\printwin.obj \
+               $(MSWDIR)\radiobox.obj \
+               $(MSWDIR)\radiobut.obj \
+               $(MSWDIR)\regconf.obj \
+               $(MSWDIR)\region.obj \
+               $(MSWDIR)\registry.obj \
+               $(MSWDIR)\scrolbar.obj \
+               $(MSWDIR)\settings.obj \
+               $(MSWDIR)\slider95.obj \
+               $(MSWDIR)\snglinst.obj \
+               $(MSWDIR)\spinbutt.obj \
+               $(MSWDIR)\spinctrl.obj \
+               $(MSWDIR)\statbmp.obj \
+               $(MSWDIR)\statbox.obj \
+               $(MSWDIR)\statbr95.obj \
+               $(MSWDIR)\statline.obj \
+               $(MSWDIR)\stattext.obj \
+               $(MSWDIR)\tabctrl.obj \
+               $(MSWDIR)\taskbar.obj \
+               $(MSWDIR)\tbar95.obj \
+               $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\tglbtn.obj \
+               $(MSWDIR)\thread.obj \
+               $(MSWDIR)\timer.obj \
+               $(MSWDIR)\tooltip.obj \
+               $(MSWDIR)\toplevel.obj \
+               $(MSWDIR)\treectrl.obj \
+               $(MSWDIR)\utils.obj \
+               $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\uuid.obj \
+               $(MSWDIR)\volume.obj \
+               $(MSWDIR)\wave.obj \
+               $(MSWDIR)\window.obj
+
+GENERICUNIVOBJS= $(MSWDIR)\accel.obj \
+               $(MSWDIR)\busyinfo.obj \
+               $(MSWDIR)\calctrl.obj \
+               $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\colrdlgg.obj \
+               $(MSWDIR)\dcbuffer.obj \
+               $(MSWDIR)\dcpsg.obj \
+               $(MSWDIR)\dirctrlg.obj \
+               $(MSWDIR)\dragimgg.obj \
+               $(MSWDIR)\fdrepdlg.obj \
+               $(MSWDIR)\filedlgg.obj \
+               $(MSWDIR)\fontdlgg.obj \
+               $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridctrl.obj \
+               $(MSWDIR)\gridsel.obj \
+               $(MSWDIR)\helpext.obj \
+               $(MSWDIR)\helphtml.obj \
+               $(MSWDIR)\imaglist.obj \
+               $(MSWDIR)\laywin.obj \
+               $(MSWDIR)\listctrl.obj \
+               $(MSWDIR)\logg.obj \
+               $(MSWDIR)\mdig.obj \
+               $(MSWDIR)\msgdlgg.obj \
+               $(MSWDIR)\numdlgg.obj \
+               $(MSWDIR)\panelg.obj \
+               $(MSWDIR)\printps.obj \
+               $(MSWDIR)\prntdlgg.obj \
+               $(MSWDIR)\progdlgg.obj \
+               $(MSWDIR)\prop.obj \
+               $(MSWDIR)\propform.obj \
+               $(MSWDIR)\proplist.obj \
+               $(MSWDIR)\sashwin.obj \
+               $(MSWDIR)\scrlwing.obj \
+               $(MSWDIR)\spinctlg.obj \
+               $(MSWDIR)\splash.obj \
+               $(MSWDIR)\splitter.obj \
+               $(MSWDIR)\tabg.obj \
+               $(MSWDIR)\tbarsmpl.obj \
+               $(MSWDIR)\textdlgg.obj \
+               $(MSWDIR)\tipdlg.obj \
+               $(MSWDIR)\tipwin.obj \
+               $(MSWDIR)\treectlg.obj \
+               $(MSWDIR)\treelay.obj \
+               $(MSWDIR)\wizard.obj
+
+MSWUNIVOBJS = $(MSWDIR)\app.obj \
+               $(MSWDIR)\automtn.obj \
+               $(MSWDIR)\bitmap.obj \
+               $(MSWDIR)\brush.obj \
+               $(MSWDIR)\caret.obj \
+               $(MSWDIR)\clipbrd.obj \
+               $(MSWDIR)\colour.obj \
+               $(MSWDIR)\cursor.obj \
+               $(MSWDIR)\data.obj \
+               $(MSWDIR)\dataobj.obj \
+               $(MSWDIR)\dc.obj \
+               $(MSWDIR)\dcclient.obj \
+               $(MSWDIR)\dcmemory.obj \
+               $(MSWDIR)\dcprint.obj \
+               $(MSWDIR)\dcscreen.obj \
+               $(MSWDIR)\dde.obj \
+               $(MSWDIR)\dialup.obj \
+               $(MSWDIR)\dib.obj \
+               $(MSWDIR)\dir.obj \
+               $(MSWDIR)\dirdlg.obj \
+               $(MSWDIR)\dropsrc.obj \
+               $(MSWDIR)\droptgt.obj \
+               $(MSWDIR)\enhmeta.obj \
+               $(MSWDIR)\evtloop.obj \
+               $(MSWDIR)\font.obj \
+               $(MSWDIR)\fontenum.obj \
+               $(MSWDIR)\fontutil.obj \
+               $(MSWDIR)\gdiimage.obj \
+               $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\glcanvas.obj \
+               $(MSWDIR)\gsocket.obj \
+               $(MSWDIR)\gsockmsw.obj \
+               $(MSWDIR)\helpbest.obj \
+               $(MSWDIR)\helpchm.obj \
+               $(MSWDIR)\helpwin.obj \
+               $(MSWDIR)\icon.obj \
+               $(MSWDIR)\joystick.obj \
+               $(MSWDIR)\main.obj \
+               $(MSWDIR)\mimetype.obj \
+               $(MSWDIR)\minifram.obj \
+               $(MSWDIR)\oleutils.obj \
+               $(MSWDIR)\palette.obj \
+               $(MSWDIR)\pen.obj \
+               $(MSWDIR)\popupwin.obj \
+               $(MSWDIR)\regconf.obj \
+               $(MSWDIR)\region.obj \
+               $(MSWDIR)\registry.obj \
+               $(MSWDIR)\settings.obj \
+               $(MSWDIR)\snglinst.obj \
+               $(MSWDIR)\taskbar.obj \
+               $(MSWDIR)\thread.obj \
+               $(MSWDIR)\timer.obj \
+               $(MSWDIR)\tooltip.obj \
+               $(MSWDIR)\toplevel.obj \
+               $(MSWDIR)\utils.obj \
+               $(MSWDIR)\utilsexc.obj \
+               $(MSWDIR)\uuid.obj \
+               $(MSWDIR)\volume.obj \
+               $(MSWDIR)\wave.obj \
+               $(MSWDIR)\window.obj
+
+UNIVOBJS = $(MSWDIR)\bmpbuttn.obj \
+               $(MSWDIR)\button.obj \
+               $(MSWDIR)\checkbox.obj \
+               $(MSWDIR)\checklst.obj \
+               $(MSWDIR)\choice.obj \
+               $(MSWDIR)\colschem.obj \
+               $(MSWDIR)\combobox.obj \
+               $(MSWDIR)\control.obj \
+               $(MSWDIR)\dialog.obj \
+               $(MSWDIR)\framuniv.obj \
+               $(MSWDIR)\gauge.obj \
+               $(MSWDIR)\inpcons.obj \
+               $(MSWDIR)\inphand.obj \
+               $(MSWDIR)\listbox.obj \
+               $(MSWDIR)\menu.obj \
+               $(MSWDIR)\notebook.obj \
+               $(MSWDIR)\radiobox.obj \
+               $(MSWDIR)\radiobut.obj \
+               $(MSWDIR)\renderer.obj \
+               $(MSWDIR)\scrarrow.obj \
+               $(MSWDIR)\scrolbar.obj \
+               $(MSWDIR)\scrthumb.obj \
+               $(MSWDIR)\slider.obj \
+               $(MSWDIR)\spinbutt.obj \
+               $(MSWDIR)\statbmp.obj \
+               $(MSWDIR)\statbox.obj \
+               $(MSWDIR)\statline.obj \
+               $(MSWDIR)\stattext.obj \
+               $(MSWDIR)\statusbr.obj \
+               $(MSWDIR)\textctrl.obj \
+               $(MSWDIR)\theme.obj \
+               $(MSWDIR)\toolbar.obj \
+               $(MSWDIR)\topluniv.obj \
+               $(MSWDIR)\winuniv.obj
+
+UNIVTHEMEOBJS = $(MSWDIR)\gtk.obj \
+               $(MSWDIR)\metal.obj \
+               $(MSWDIR)\win32.obj
+
+HTMLOBJS = $(MSWDIR)\helpctrl.obj \
+               $(MSWDIR)\helpdata.obj \
+               $(MSWDIR)\helpfrm.obj \
+               $(MSWDIR)\htmlcell.obj \
+               $(MSWDIR)\htmlfilt.obj \
+               $(MSWDIR)\htmlpars.obj \
+               $(MSWDIR)\htmltag.obj \
+               $(MSWDIR)\htmlwin.obj \
+               $(MSWDIR)\htmprint.obj \
+               $(MSWDIR)\m_dflist.obj \
+               $(MSWDIR)\m_fonts.obj \
+               $(MSWDIR)\m_hline.obj \
+               $(MSWDIR)\m_image.obj \
+               $(MSWDIR)\m_layout.obj \
+               $(MSWDIR)\m_links.obj \
+               $(MSWDIR)\m_list.obj \
+               $(MSWDIR)\m_pre.obj \
+               $(MSWDIR)\m_style.obj \
+               $(MSWDIR)\m_tables.obj \
+               $(MSWDIR)\winpars.obj
 
 COMMONOBJS = \
-               $(MSWDIR)\y_tab.obj \
-               $(MSWDIR)\appcmn.obj \
+        $(MSWDIR)\y_tab.obj \
+        $(MSWDIR)\appcmn.obj \
                $(MSWDIR)\artprov.obj \
                $(MSWDIR)\artstd.obj \
                $(MSWDIR)\choiccmn.obj \
@@ -196,6 +463,7 @@ COMMONOBJS = \
                $(MSWDIR)\menucmn.obj \
                $(MSWDIR)\mimecmn.obj \
                $(MSWDIR)\module.obj \
+               $(MSWDIR)\msgout.obj \
                $(MSWDIR)\mstream.obj \
                $(MSWDIR)\nbkbase.obj \
                $(MSWDIR)\object.obj \
@@ -213,6 +481,7 @@ COMMONOBJS = \
                $(MSWDIR)\sckfile.obj \
                $(MSWDIR)\sckipc.obj \
                $(MSWDIR)\sckstrm.obj \
+               $(MSWDIR)\settcmn.obj \
                $(MSWDIR)\sizer.obj \
                $(MSWDIR)\socket.obj \
                $(MSWDIR)\statbar.obj \
@@ -244,203 +513,207 @@ COMMONOBJS = \
                $(MSWDIR)\zipstrm.obj \
                $(MSWDIR)\zstream.obj
 
-MSWOBJS = $(MSWDIR)\accel.obj \
-               $(MSWDIR)\app.obj \
-               $(MSWDIR)\automtn.obj \
-               $(MSWDIR)\bitmap.obj \
-               $(MSWDIR)\bmpbuttn.obj \
-               $(MSWDIR)\brush.obj \
-               $(MSWDIR)\button.obj \
-               $(MSWDIR)\caret.obj \
-               $(MSWDIR)\checkbox.obj \
-               $(MSWDIR)\checklst.obj \
-               $(MSWDIR)\choice.obj \
-               $(MSWDIR)\clipbrd.obj \
-               $(MSWDIR)\colordlg.obj \
-               $(MSWDIR)\colour.obj \
-               $(MSWDIR)\combobox.obj \
-               $(MSWDIR)\control.obj \
-               $(MSWDIR)\curico.obj \
-               $(MSWDIR)\cursor.obj \
-               $(MSWDIR)\data.obj \
-               $(MSWDIR)\dataobj.obj \
-               $(MSWDIR)\dc.obj \
-               $(MSWDIR)\dcclient.obj \
-               $(MSWDIR)\dcmemory.obj \
-               $(MSWDIR)\dcprint.obj \
-               $(MSWDIR)\dcscreen.obj \
-               $(MSWDIR)\dde.obj \
-               $(MSWDIR)\dialog.obj \
-               $(MSWDIR)\dialup.obj \
-               $(MSWDIR)\dib.obj \
-               $(MSWDIR)\dibutils.obj \
-               $(MSWDIR)\dir.obj \
-               $(MSWDIR)\dirdlg.obj \
-               $(MSWDIR)\dragimag.obj \
-               $(MSWDIR)\dropsrc.obj \
-               $(MSWDIR)\droptgt.obj \
-               $(MSWDIR)\enhmeta.obj \
-               $(MSWDIR)\evtloop.obj \
-               $(MSWDIR)\fdrepdlg.obj \
-               $(MSWDIR)\filedlg.obj \
-               $(MSWDIR)\font.obj \
-               $(MSWDIR)\fontdlg.obj \
-               $(MSWDIR)\fontenum.obj \
-               $(MSWDIR)\fontutil.obj \
-               $(MSWDIR)\frame.obj \
-               $(MSWDIR)\gauge95.obj \
-               $(MSWDIR)\gdiimage.obj \
-               $(MSWDIR)\gdiobj.obj \
-               $(MSWDIR)\glcanvas.obj \
-               $(MSWDIR)\gsocket.obj \
-               $(MSWDIR)\gsockmsw.obj \
-               $(MSWDIR)\helpbest.obj \
-               $(MSWDIR)\helpchm.obj \
-               $(MSWDIR)\helpwin.obj \
-               $(MSWDIR)\icon.obj \
-               $(MSWDIR)\imaglist.obj \
-               $(MSWDIR)\iniconf.obj \
-               $(MSWDIR)\joystick.obj \
-               $(MSWDIR)\listbox.obj \
-               $(MSWDIR)\listctrl.obj \
-               $(MSWDIR)\main.obj \
-               $(MSWDIR)\mdi.obj \
-               $(MSWDIR)\menu.obj \
-               $(MSWDIR)\menuitem.obj \
-               $(MSWDIR)\metafile.obj \
-               $(MSWDIR)\mimetype.obj \
-               $(MSWDIR)\minifram.obj \
-               $(MSWDIR)\msgdlg.obj \
-               $(MSWDIR)\mslu.obj \
-               $(MSWDIR)\nativdlg.obj \
-               $(MSWDIR)\notebook.obj \
-               $(MSWDIR)\oleutils.obj \
-               $(MSWDIR)\ownerdrw.obj \
-               $(MSWDIR)\palette.obj \
-               $(MSWDIR)\pen.obj \
-               $(MSWDIR)\penwin.obj \
-               $(MSWDIR)\printdlg.obj \
-               $(MSWDIR)\printwin.obj \
-               $(MSWDIR)\radiobox.obj \
-               $(MSWDIR)\radiobut.obj \
-               $(MSWDIR)\regconf.obj \
-               $(MSWDIR)\region.obj \
-               $(MSWDIR)\registry.obj \
-               $(MSWDIR)\scrolbar.obj \
-               $(MSWDIR)\settings.obj \
-               $(MSWDIR)\slider95.obj \
-               $(MSWDIR)\snglinst.obj \
-               $(MSWDIR)\spinbutt.obj \
-               $(MSWDIR)\spinctrl.obj \
-               $(MSWDIR)\statbmp.obj \
-               $(MSWDIR)\statbox.obj \
-               $(MSWDIR)\statbr95.obj \
-               $(MSWDIR)\statline.obj \
-               $(MSWDIR)\stattext.obj \
-               $(MSWDIR)\tabctrl.obj \
-               $(MSWDIR)\taskbar.obj \
-               $(MSWDIR)\tbar95.obj \
-               $(MSWDIR)\textctrl.obj \
-               $(MSWDIR)\tglbtn.obj \
-               $(MSWDIR)\thread.obj \
-               $(MSWDIR)\timer.obj \
-               $(MSWDIR)\tooltip.obj \
-               $(MSWDIR)\toplevel.obj \
-               $(MSWDIR)\treectrl.obj \
-               $(MSWDIR)\utils.obj \
-               $(MSWDIR)\utilsexc.obj \
-               $(MSWDIR)\uuid.obj \
-               $(MSWDIR)\volume.obj \
-               $(MSWDIR)\wave.obj \
-               $(MSWDIR)\window.obj
+!if "$(WXUSINGUNIV)" == "1"
+OBJECTS = $(COMMONOBJS) $(GENERICUNIVOBJS) $(MSWUNIVOBJS) $(HTMLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS)
+!else
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+!endif
+
+default:    wx
+
+wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+all:    wx
+
+# Copy the in-CVS setup0.h to setup.h if necessary
+makesetuph:
+     cd $(WXDIR)\include\wx\msw
+     if not exist setup.h copy setup0.h setup.h
+     cd $(WXDIR)\src\msw
+
+# Copy include\wx\msw\setup.h to the architecture-specific location
+makearchsetuph:
+     copy $(SETUPSRCDIR)\setup.h $(ARCHSETUPH)
+     cd $(WXDIR)\src\msw
+
+$(ARCHINCDIR)\wx:
+    -mkdir $(ARCHINCDIR)
+    -mkdir $(ARCHINCDIR)\wx
+    -erase $(CFG)
+
+!if "$(DLL)" == "0"
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+        -erase $(LIBTARGET)
+    tlib "$(LIBTARGET)" /P1024 $(LINKDEBUGFLAGS) @&&!
++$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+!
+
+!else
+
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
+    -erase $(LIBTARGET)
+    -erase $(WXDLL)
+        $(LINK) $(LINK_FLAGS) $(LINKDEBUGFLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk @&&!
+c0d32.obj $(OBJECTS)
+$(WXDLL)
+nul
+$(PERIPH_LIBS) $(LIBS)
+wxb32
+!
+        implib -c $(LIBTARGET) $(WXDLL)
+!endif
+
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
+
+version.res:
+    brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
+
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+
+#        cl @<<
+# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+# <<
+
+$(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
+
+# $(OBJECTS):   $(WXDIR)\include\wx\setup.h
+
+!if "$(WXUSINGUNIV)" == "1"
+########################################################
+# MSW objects (compile Native or UNIV) - UNIV
+
+$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
+
+$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+
+$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
+
+$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
+
+$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
+
+$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
+
+$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
+
+$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
+
+$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
+
+$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
+
+$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
+
+$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
+
+$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
+
+$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
+
+$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
+
+$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
+
+$(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
+
+$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
+
+$(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
+
+$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
+
+$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
+
+$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
 
-HTMLOBJS = $(MSWDIR)\helpctrl.obj \
-               $(MSWDIR)\helpdata.obj \
-               $(MSWDIR)\helpfrm.obj \
-               $(MSWDIR)\htmlcell.obj \
-               $(MSWDIR)\htmlfilt.obj \
-               $(MSWDIR)\htmlpars.obj \
-               $(MSWDIR)\htmltag.obj \
-               $(MSWDIR)\htmlwin.obj \
-               $(MSWDIR)\htmprint.obj \
-               $(MSWDIR)\m_dflist.obj \
-               $(MSWDIR)\m_fonts.obj \
-               $(MSWDIR)\m_hline.obj \
-               $(MSWDIR)\m_image.obj \
-               $(MSWDIR)\m_layout.obj \
-               $(MSWDIR)\m_links.obj \
-               $(MSWDIR)\m_list.obj \
-               $(MSWDIR)\m_meta.obj \
-               $(MSWDIR)\m_pre.obj \
-               $(MSWDIR)\m_style.obj \
-               $(MSWDIR)\m_tables.obj \
-               $(MSWDIR)\winpars.obj
+$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
 
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
+$(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
 
-default:       wx
+$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
-wx:    $(ARCHINCDIR)\wx makesetuph makearchsetuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+$(MSWDIR)\fontenum.obj: $(MSWDIR)\fontenum.$(SRCSUFF)
 
-all:   wx
+$(MSWDIR)\fontutil.obj: $(MSWDIR)\fontutil.$(SRCSUFF)
 
-# Copy the in-CVS setup0.h to setup.h if necessary
-makesetuph:
-     cd $(WXDIR)\include\wx\msw
-     if not exist setup.h copy setup0.h setup.h
-     cd $(WXDIR)\src\msw
+$(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
-# Copy include\wx\msw\setup.h to the architecture-specific location
-makearchsetuph:
-     copy $(WXDIR)\include\wx\msw\setup.h $(ARCHSETUPH)
-     cd $(WXDIR)\src\msw
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(ARCHINCDIR)\wx:
-    -mkdir $(ARCHINCDIR)
-    -mkdir $(ARCHINCDIR)\wx
+$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
-!if "$(DLL)" == "0"
+$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
-$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-        -erase $(LIBTARGET)
-       tlib "$(LIBTARGET)" /P1024 @&&!
-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
-!
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
 
-!else
+$(MSWDIR)\helpbest.obj: $(MSWDIR)\helpbest.$(SRCSUFF)
 
-$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-       -erase $(LIBTARGET)
-       -erase $(WXLIBDIR)\wx.dll
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
-c0d32.obj $(OBJECTS)
-$(WXLIBDIR)\wx
-nul
-$(PERIPH_LIBS) $(LIBS)
-wxb32
-!
-       -erase $(WXLIBDIR)\version.res
-        brc32 -r -i$(WXDIR)\include\ $(MSWDIR)\version.rc
-        implib -c $(LIBTARGET) $(WXLIBDIR)\wx.dll
+$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
 
-!endif
+$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
-dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h version.res
+$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
+$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
+
+$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
+
+$(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
+
+$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
+
+$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
+
+$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
+
+$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
+
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
+$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
+
+$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
+
+$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
+
+$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
+
+$(MSWDIR)\snglinst.obj: $(MSWDIR)\snglinst.$(SRCSUFF)
+
+$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
+
+$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
+
+$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
+
+$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
+
+$(MSWDIR)\toplevel.obj: $(MSWDIR)\toplevel.$(SRCSUFF)
+
+$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
+
+$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
+
+$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+
+$(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
+
+$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
+
+$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-#        cl @<<
-# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-# <<
 
-$(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
 
-# $(OBJECTS):  $(WXDIR)\include\wx\setup.h
+!else
+########################################################
+# MSW objects (compile Native or UNIV) - Native
 
 $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
@@ -500,8 +773,6 @@ $(MSWDIR)\dialup.obj: $(MSWDIR)\dialup.$(SRCSUFF)
 
 $(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
-
 $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
 $(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
@@ -592,6 +863,8 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
 $(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
+$(MSWDIR)\popupwin.obj: $(MSWDIR)\popupwin.$(SRCSUFF)
+
 $(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
 $(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
@@ -661,6 +934,94 @@ $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
 
+!endif
+
+!if "$(WXUSINGUNIV)" == "1"
+########################################################
+# UNIV objects 
+$(MSWDIR)\bmpbuttn.obj: $(UNIVDIR)\bmpbuttn.$(SRCSUFF)
+
+$(MSWDIR)\button.obj: $(UNIVDIR)\button.$(SRCSUFF)
+
+$(MSWDIR)\checkbox.obj: $(UNIVDIR)\checkbox.$(SRCSUFF)
+
+$(MSWDIR)\checklst.obj: $(UNIVDIR)\checklst.$(SRCSUFF)
+
+$(MSWDIR)\choice.obj: $(UNIVDIR)\choice.$(SRCSUFF)
+
+$(MSWDIR)\colschem.obj: $(UNIVDIR)\colschem.$(SRCSUFF)
+
+$(MSWDIR)\combobox.obj: $(UNIVDIR)\combobox.$(SRCSUFF)
+
+$(MSWDIR)\control.obj: $(UNIVDIR)\control.$(SRCSUFF)
+
+$(MSWDIR)\dialog.obj: $(UNIVDIR)\dialog.$(SRCSUFF)
+
+$(MSWDIR)\framuniv.obj: $(UNIVDIR)\framuniv.$(SRCSUFF)
+
+$(MSWDIR)\gauge.obj: $(UNIVDIR)\gauge.$(SRCSUFF)
+
+$(MSWDIR)\inpcons.obj: $(UNIVDIR)\inpcons.$(SRCSUFF)
+
+$(MSWDIR)\inphand.obj: $(UNIVDIR)\inphand.$(SRCSUFF)
+
+$(MSWDIR)\listbox.obj: $(UNIVDIR)\listbox.$(SRCSUFF)
+
+$(MSWDIR)\menu.obj: $(UNIVDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\notebook.obj: $(UNIVDIR)\notebook.$(SRCSUFF)
+
+$(MSWDIR)\radiobox.obj: $(UNIVDIR)\radiobox.$(SRCSUFF)
+
+$(MSWDIR)\radiobut.obj: $(UNIVDIR)\radiobut.$(SRCSUFF)
+
+$(MSWDIR)\renderer.obj: $(UNIVDIR)\renderer.$(SRCSUFF)
+
+$(MSWDIR)\scrarrow.obj: $(UNIVDIR)\scrarrow.$(SRCSUFF)
+
+$(MSWDIR)\scrolbar.obj: $(UNIVDIR)\scrolbar.$(SRCSUFF)
+
+$(MSWDIR)\scrthumb.obj: $(UNIVDIR)\scrthumb.$(SRCSUFF)
+
+$(MSWDIR)\slider.obj: $(UNIVDIR)\slider.$(SRCSUFF)
+
+$(MSWDIR)\spinbutt.obj: $(UNIVDIR)\spinbutt.$(SRCSUFF)
+
+$(MSWDIR)\statbmp.obj: $(UNIVDIR)\statbmp.$(SRCSUFF)
+
+$(MSWDIR)\statbox.obj: $(UNIVDIR)\statbox.$(SRCSUFF)
+
+$(MSWDIR)\statline.obj: $(UNIVDIR)\statline.$(SRCSUFF)
+
+$(MSWDIR)\stattext.obj: $(UNIVDIR)\stattext.$(SRCSUFF)
+
+$(MSWDIR)\statusbr.obj: $(UNIVDIR)\statusbr.$(SRCSUFF)
+
+$(MSWDIR)\textctrl.obj: $(UNIVDIR)\textctrl.$(SRCSUFF)
+
+$(MSWDIR)\theme.obj: $(UNIVDIR)\theme.$(SRCSUFF)
+
+$(MSWDIR)\toolbar.obj: $(UNIVDIR)\toolbar.$(SRCSUFF)
+
+$(MSWDIR)\topluniv.obj: $(UNIVDIR)\topluniv.$(SRCSUFF)
+
+$(MSWDIR)\winuniv.obj: $(UNIVDIR)\winuniv.$(SRCSUFF)
+
+
+
+
+########################################################
+# UNIV THEME objects 
+
+$(MSWDIR)\gtk.obj: $(UNIVTHEMEDIR)\gtk.$(SRCSUFF)
+
+$(MSWDIR)\metal.obj: $(UNIVTHEMEDIR)\metal.$(SRCSUFF)
+
+$(MSWDIR)\win32.obj: $(UNIVTHEMEDIR)\win32.$(SRCSUFF)
+
+
+
+!endif
 
 ########################################################
 # Common objects (always compiled)
@@ -827,6 +1188,8 @@ $(MSWDIR)\mimecmn.obj: $(COMMDIR)\mimecmn.$(SRCSUFF)
 
 $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
+$(MSWDIR)\msgout.obj: $(COMMDIR)\msgout.$(SRCSUFF)
+
 $(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
 $(MSWDIR)\nbkbase.obj: $(COMMDIR)\nbkbase.$(SRCSUFF)
@@ -861,6 +1224,8 @@ $(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
 
 $(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
 
+$(MSWDIR)\settcmn.obj: $(COMMDIR)\settcmn.$(SRCSUFF)
+
 $(MSWDIR)\sizer.obj: $(COMMDIR)\sizer.$(SRCSUFF)
 
 $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
@@ -923,9 +1288,108 @@ $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 
 
+!if "$(WXUSINGUNIV)" == "1"
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+# Native
+
+
+$(MSWDIR)\accel.obj: $(GENDIR)\accel.$(SRCSUFF)
+
+$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
+
+$(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
+
+$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
+
+$(MSWDIR)\colrdlgg.obj: $(GENDIR)\colrdlgg.$(SRCSUFF)
+
+$(MSWDIR)\dcbuffer.obj: $(GENDIR)\dcbuffer.$(SRCSUFF)
+
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+
+$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+
+$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+
+$(MSWDIR)\fdrepdlg.obj: $(GENDIR)\fdrepdlg.$(SRCSUFF)
+
+$(MSWDIR)\filedlgg.obj: $(GENDIR)\filedlgg.$(SRCSUFF)
+
+$(MSWDIR)\fontdlgg.obj: $(GENDIR)\fontdlgg.$(SRCSUFF)
+
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
+
+$(MSWDIR)\gridctrl.obj: $(GENDIR)\gridctrl.$(SRCSUFF)
+
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
+$(MSWDIR)\helpext.obj: $(GENDIR)\helpext.$(SRCSUFF)
+
+$(MSWDIR)\helphtml.obj: $(GENDIR)\helphtml.$(SRCSUFF)
+
+$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
+
+$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
+
+$(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
+
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+
+$(MSWDIR)\mdig.obj: $(GENDIR)\mdig.$(SRCSUFF)
+
+$(MSWDIR)\msgdlgg.obj: $(GENDIR)\msgdlgg.$(SRCSUFF)
+
+$(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
+
+$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
+
+$(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
+
+$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
+
+$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
+
+$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
+
+$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
+
+$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
+
+$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
+
+$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
+
+$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
+
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
+
+$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
+
+$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
+
+$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
+
+$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
+
+$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
+
+$(MSWDIR)\tipwin.obj: $(GENDIR)\tipwin.$(SRCSUFF)
+
+$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+
+$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
+
+$(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
+
+
+
+!else
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
+# Native
 
 $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
@@ -990,6 +1454,7 @@ $(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
+!endif
 
 ########################################################
 # HTML objects (always compiled)
@@ -1026,8 +1491,6 @@ $(MSWDIR)\m_links.obj: $(HTMLDIR)\m_links.$(SRCSUFF)
 
 $(MSWDIR)\m_list.obj: $(HTMLDIR)\m_list.$(SRCSUFF)
 
-$(MSWDIR)\m_meta.obj: $(HTMLDIR)\m_meta.$(SRCSUFF)
-
 $(MSWDIR)\m_pre.obj: $(HTMLDIR)\m_pre.$(SRCSUFF)
 
 $(MSWDIR)\m_style.obj: $(HTMLDIR)\m_style.$(SRCSUFF)
@@ -1041,71 +1504,71 @@ $(MSWDIR)\winpars.obj: $(HTMLDIR)\winpars.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
-    make -f makefile.b32
+    ${MAKE} -f makefile.b32
     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples
-    make -f makefile.b32
+    ${MAKE} -f makefile.b32
     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils
-    make -f makefile.b32 all_execs
+    ${MAKE} -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
-        make -f makefile.b32
+        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 jpeg:    $(CFG)
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32
+        ${MAKE} -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\src\msw
 
 clean_jpeg:
         cd $(WXDIR)\src\jpeg
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 regex:   $(CFG)
         cd $(WXDIR)\src\regex
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_regex:
         cd $(WXDIR)\src\regex
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 tiff:   $(CFG)
         cd $(WXDIR)\src\tiff
-        make -f makefile.b32 lib
+        ${MAKE} -f makefile.b32 FINAL=$(FINAL) lib
         cd $(WXDIR)\src\msw
 
 clean_tiff:
         cd $(WXDIR)\src\tiff
-        make -f makefile.b32 clean
+        ${MAKE} -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.b32
-       copy &&!
+    copy &&!
 -Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
@@ -1123,7 +1586,7 @@ $(CFG): makefile.b32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
--D__WXMSW__
+-D$(PORT)
 -D__WINDOWS__
 -DWIN32
 $(OPT)
@@ -1132,14 +1595,11 @@ $(WIN95FLAG)
 ! $(CFG)
 
 clean: $(PERIPH_CLEAN_TARGET)
-    -erase $(LIBTARGET)
-    -erase $(WXLIBDIR)\wx.dll
     -erase $(WXLIBDIR)\wx.tds
     -erase $(WXLIBDIR)\wx.il?
     -erase *.obj
     -erase *.pch
     -erase *.csm
-    -erase *.cfg
     -erase "wx32.#??"
     -erase ..\common\y_tab.c
     -erase ..\common\lex_yy.c
@@ -1159,82 +1619,82 @@ proprtf: $(DOCDIR)/winhelp/prop.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 proppdfrtf: $(DOCDIR)/pdf/prop.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
-html:  wxhtml portinghtml
-wxhtml:        $(DOCDIR)\html\wx\wx.htm
+html:   wxhtml portinghtml
+wxhtml: $(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 prophtml: $(DOCDIR)\html\proplist\prop.htm
 ps:     wxps referencps
-wxps:  $(WXDIR)\docs\ps\wx.ps
-propps:        $(WXDIR)\docs\ps\prop.ps
-referencps:    $(WXDIR)\docs\ps\referenc.ps
+wxps:   $(WXDIR)\docs\ps\wx.ps
+propps: $(WXDIR)\docs\ps\prop.ps
+referencps: $(WXDIR)\docs\ps\referenc.ps
 
 portinghtml: $(DOCDIR)\html\porting\port.htm
 portingrtf: $(DOCDIR)/winhelp/porting.rtf
 portinghlp: $(DOCDIR)/winhelp/porting.hlp
 portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
-portingps:     $(WXDIR)\docs\ps\porting.ps
+portingps:  $(WXDIR)\docs\ps\porting.ps
 
 allhlp: wxhlp portinghlp prophlp
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 hlp
+        ${MAKE} -f makefile.b32 hlp
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxbuild\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 #        cd $(WXDIR)\utils\wxgrid\src
-#        make -f makefile.b32 hlp
+#        ${MAKE} -f makefile.b32 hlp
 
 allhtml: wxhtml portinghtml prophtml
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 html
+        ${MAKE} -f makefile.b32 html
         cd $(THISDIR)
 
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\dialoged\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\hytext\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 html
+#        ${MAKE} -f makefile.b32 html
 
 allps: wxps referencps portingps propps
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 ps
+        ${MAKE} -f makefile.b32 ps
         cd $(THISDIR)
 
 allpdfrtf: pdfrtf portingpdfrtf proppdfrtf
         cd $(WXDIR)\utils\dialoged\src
-        make -f makefile.b32 pdfrtf
+        ${MAKE} -f makefile.b32 pdfrtf
         cd $(THISDIR)
 
 #        cd $(WXDIR)\utils\wxhelp\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\tex2rtf\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxgraph\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxchart\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(WXDIR)\utils\wxtree\src
-#        make -f makefile.b32 ps
+#        ${MAKE} -f makefile.b32 ps
 #        cd $(THISDIR)
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
@@ -1328,9 +1788,9 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
-       cd $(DOCDIR)\html\wx
-       -hhc wx.hhp
-       cd $(THISDIR)
+    cd $(DOCDIR)\html\wx
+    -hhc wx.hhp
+    cd $(THISDIR)
 
 
 $(DOCDIR)\html\porting\port.htm:         $(DOCDIR)\latex\porting\porting.tex
@@ -1353,8 +1813,8 @@ $(DOCDIR)\html\proplist\prop.htm:         $(DOCDIR)\latex\proplist\prop.tex $(DO
         -erase $(DOCDIR)\latex\proplist\*.ref
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\manual.dvi:     $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
-       cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\manual.dvi:  $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+    cd $(WXDIR)\docs\latex\wx
         -latex manual
         -latex manual
         -makeindx manual
@@ -1363,8 +1823,8 @@ $(WXDIR)\docs\latex\wx\manual.dvi:        $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/w
         -latex manual
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\porting\porting.dvi:       $(DOCDIR)/latex/porting/porting.tex
-       cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\latex\porting\porting.dvi:    $(DOCDIR)/latex/porting/porting.tex
+    cd $(WXDIR)\docs\latex\porting
         -latex porting
         -latex porting
         -makeindx porting
@@ -1373,20 +1833,20 @@ $(WXDIR)\docs\latex\porting\porting.dvi:        $(DOCDIR)/latex/porting/porting.tex
         -latex porting
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\wx.ps:        $(WXDIR)\docs\latex\wx\manual.dvi
-       cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
+    cd $(WXDIR)\docs\latex\wx
         -dvips32 -o wx.ps manual
         move wx.ps $(WXDIR)\docs\ps\wx.ps
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\porting.ps:   $(WXDIR)\docs\latex\porting\porting.dvi
-       cd $(WXDIR)\docs\latex\porting
+$(WXDIR)\docs\ps\porting.ps:    $(WXDIR)\docs\latex\porting\porting.dvi
+    cd $(WXDIR)\docs\latex\porting
         -dvips32 -o porting.ps porting
         move porting.ps $(WXDIR)\docs\ps\porting.ps
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\referenc.dvi:   $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
-       cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\referenc.dvi:    $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+    cd $(WXDIR)\docs\latex\wx
         -latex referenc
         -latex referenc
         -makeindx referenc
@@ -1395,8 +1855,8 @@ $(WXDIR)\docs\latex\wx\referenc.dvi:      $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/la
         -latex referenc
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\referenc.ps:  $(WXDIR)\docs\latex\wx\referenc.dvi
-       cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\referenc.ps:   $(WXDIR)\docs\latex\wx\referenc.dvi
+    cd $(WXDIR)\docs\latex\wx
         -dvips32 -o referenc.ps referenc
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         cd $(THISDIR)
@@ -1418,7 +1878,6 @@ MFTYPE=b32
 # makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
 
 self:
-       cd $(WXWIN)\distrib\msw\tmake
-       tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-       copy makefile.$(MFTYPE) $(WXWIN)\src\msw
-
+    cd $(WXWIN)\distrib\msw\tmake
+    tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+    copy makefile.$(MFTYPE) $(WXWIN)\src\msw