X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d7d8f3b3b048a683ddcb61942ae5ffe9652ed29..ef1b8570d59d41b9154d2f8a74732508741c6fdb:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 2ccfc83350..06506792b9 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -4,24 +4,29 @@
 
 <!-- ======================================================================
                                        FILES
-         
+
      Files are listed in variables according to this scheme:
      * each group has _SRC and _HDR variable, for sources and headers
        respectively
      * file groups are:
 
-       BASE_CMN                common base files (all platforms)
-       GUICMN                  common GUI files (all platforms)
+       BASE_CMN                      common base files (all platforms)
+       GUI_CMN                       common GUI files (all platforms)
+       BASE_AND_GUI_CMN_SRC          files that must be compiled both into GUI
+                                     and base library (all platforms)
+
+       BASE_$(platform)              base files used on platform
+       BASE_AND_GUI_$(platform)_SRC  base & gui files used on platform
 
-       BASE_$(platform)        base files used on platform
-       $(port)LOWLEVEL         low-level GUI classes
-       $(port)                 high-level files for a port
-       XWIN_LOWLEVEL           low-level classes for X Window System port
+       $(port)LOWLEVEL               low-level GUI classes
+       $(port)                       high-level files for a port
+       XWIN_LOWLEVEL                 low-level classes for X Window System
+                                     ports (wxGTK, wxMotif, wxX11)
+
+       HTML                          wxHTML files
 
-       HTML                    wxHTML files
-  
      * one file may be listed in several groups
-    
+
      ====================================================================== -->
 
 
@@ -33,25 +38,26 @@
 
 <set var="BASE_UNIX_SRC">
     src/unix/baseunix.cpp
-    src/unix/dialup.cpp
     src/unix/dir.cpp
     src/unix/gsocket.c
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
+</set>
+<set var="BASE_AND_GUI_UNIX_SRC">
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR">
-    wx/unix/gsockunx.h    
+    wx/unix/gsockunx.h
     wx/unix/mimetype.h
 </set>
+
 <set var="BASE_WIN32_SRC">
     src/msw/gsocket.c
     src/msw/gsockmsw.c
     src/msw/basemsw.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp
-    src/msw/main.cpp
     src/msw/mimetype.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
@@ -59,6 +65,10 @@
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
+</set>
+<set var="BASE_AND_GUI_WIN32_SRC">
+    src/msw/main.cpp
+    src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
 <set var="BASE_WIN32_HDR">
@@ -66,18 +76,45 @@
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
+    wx/msw/wrapwin.h
+    wx/msw/chkconf.h
+</set>
+
+<set var="BASE_DARWIN_SRC">
+    src/unix/baseunix.cpp
+    src/unix/dir.cpp
+    src/unix/gsocket.c
+    src/unix/mimetype.cpp
+    src/unix/snglinst.cpp
+    src/unix/threadpsx.cpp
 </set>
+<set var="BASE_AND_GUI_DARWIN_SRC">
+    src/unix/utilsunx.cpp
+</set>
+<set var="BASE_DARWIN_HDR">
+</set>
+
 <set var="BASE_MAC_SRC">
+    src/unix/baseunix.cpp
+    src/mac/dirmac.cpp
+    src/mac/gsocket.c
+    src/mac/mimetmac.cpp
+    src/mac/utils.cpp
+    src/mac/utilsexc.cpp
 </set>
 <set var="BASE_MAC_HDR">
 </set>
+
 <set var="BASE_OS2_SRC">
     src/os2/dir.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
+<set var="BASE_AND_GUI_OS2_SRC">
+</set>
 <set var="BASE_OS2_HDR">
 </set>
+
 <set var="BASE_CMN_SRC">
     src/common/appbase.cpp
     src/common/clntdata.cpp
@@ -92,7 +129,6 @@
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
-    src/common/event.cpp
     src/common/extended.c
     src/common/ffile.cpp
     src/common/file.cpp
@@ -102,12 +138,12 @@
     src/common/filesys.cpp
     src/common/fmapbase.cpp
     src/common/fs_inet.cpp
-    src/common/fs_mem.cpp
     src/common/fs_zip.cpp
     src/common/ftp.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/http.cpp
+    src/common/init.cpp
     src/common/intl.cpp
     src/common/ipcbase.cpp
     src/common/list.cpp
@@ -116,7 +152,6 @@
     src/common/memory.cpp
     src/common/mimecmn.cpp
     src/common/module.cpp
-    src/common/msgout.cpp
     src/common/mstream.cpp
     src/common/object.cpp
     src/common/process.cpp
@@ -138,14 +173,25 @@
     src/common/txtstrm.cpp
     src/common/unzip.c
     src/common/url.cpp
-    src/common/utilscmn.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
+<set var="BASE_AND_GUI_CMN_SRC">
+    src/common/event.cpp
+    src/common/fs_mem.cpp
+    src/common/msgout.cpp
+    src/common/utilscmn.cpp
+</set>
 <set var="BASE_CMN_HDR">
+    wx/apptrait.h
+    wx/beforestd.h
+    wx/containr.h
+    wx/msgout.h
+    wx/types.h
+    wx/init.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
@@ -160,12 +206,14 @@
     wx/datetime.inl
     wx/datstrm.h
     wx/db.h
+    wx/dbkeyg.h
     wx/dbtable.h
     wx/dde.h
     wx/debug.h
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
+    wx/arrstr.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
@@ -182,10 +230,10 @@
     wx/fs_inet.h
     wx/fs_zip.h
     wx/fs_mem.h
-    wx/dbkeyg.h
     wx/gsocket.h
     wx/hash.h
     wx/hashmap.h
+    wx/iconloc.h
     wx/intl.h
     wx/iosfwrap.h
     wx/ioswrap.h
@@ -213,6 +261,7 @@
     wx/sckstrm.h
     wx/socket.h
     wx/snglinst.h
+    wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
     wx/string.h
@@ -221,7 +270,6 @@
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
-    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/url.h
@@ -236,6 +284,8 @@
     wx/wxprec.h
     wx/zipstrm.h
     wx/zstream.h
+    wx/protocol/protocol.h
+    wx/protocol/http.h
 </set>
 
 
@@ -244,7 +294,7 @@
 <!--                            Common GUI files                            -->
 <!-- ====================================================================== -->
 
-<set var="GUICMN_SRC">
+<set var="GUI_CMN_SRC">
     src/generic/selstore.cpp
     src/generic/busyinfo.cpp
     src/generic/calctrl.cpp
@@ -270,6 +320,8 @@
     src/generic/tipdlg.cpp
     src/generic/tipwin.cpp
     src/generic/treectlg.cpp
+    src/generic/vlbox.cpp
+    src/generic/vscroll.cpp
     src/generic/wizard.cpp
     src/common/appcmn.cpp
     src/common/fontmap.cpp
@@ -311,7 +363,6 @@
     src/common/imagall.cpp
     src/common/imagbmp.cpp
     src/common/image.cpp
-    src/common/imagfill.cpp
     src/common/imaggif.cpp
     src/common/imagiff.cpp
     src/common/imagjpeg.cpp
@@ -320,6 +371,7 @@
     src/common/imagpnm.cpp
     src/common/imagtiff.cpp
     src/common/imagxpm.cpp
+    src/common/imagfill.cpp
     src/common/layout.cpp
     src/common/lboxcmn.cpp
     src/common/matrix.cpp
@@ -343,11 +395,61 @@
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
 </set>
-<set var="GUICMN_HDR">
+<set var="GUI_CMN_HDR">
+    wx/gdicmn.h
+    wx/cursor.h
+    wx/window.h
+    wx/panel.h
+    wx/frame.h
+    wx/dc.h
+    wx/dcclient.h
+    wx/dcmemory.h
+    wx/dcprint.h
+    wx/dcscreen.h
+    wx/button.h
+    wx/menu.h
+    wx/pen.h
+    wx/brush.h
+    wx/palette.h
+    wx/icon.h
+    wx/dialog.h
+    wx/timer.h
+    wx/settings.h
+    wx/msgdlg.h
+    wx/cmndata.h
+    wx/control.h
+    wx/ctrlsub.h
+    wx/bmpbuttn.h
+    wx/checkbox.h
+    wx/checklst.h
+    wx/choice.h
+    wx/scrolbar.h
+    wx/stattext.h
+    wx/statbmp.h
+    wx/statbox.h
+    wx/listbox.h
+    wx/radiobox.h
+    wx/radiobut.h
+    wx/textctrl.h
+    wx/slider.h
+    wx/gauge.h
+    wx/scrolwin.h
+    wx/dirdlg.h
+    wx/toolbar.h
+    wx/combobox.h
+    wx/layout.h
+    wx/sizer.h
+    wx/mdi.h
+    wx/statusbr.h
+    wx/scrolbar.h
+    wx/choicdlg.h
+    wx/textdlg.h
+    wx/filedlg.h
+    wx/validate.h
+    wx/valtext.h
     wx/selstore.h
     wx/generic/accel.h
     wx/generic/calctrl.h
-    wx/generic/caret.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
@@ -358,6 +460,7 @@
     wx/generic/gridctrl.h
     wx/generic/grid.h
     wx/generic/helpext.h
+    wx/generic/logg.h
     wx/helphtml.h
     wx/generic/imaglist.h
     wx/generic/laywin.h
@@ -375,6 +478,111 @@
     wx/generic/timer.h
     wx/generic/wizard.h
     wx/generic/treectlg.h
+
+    wx/accel.h
+    wx/access.h
+    wx/afterstd.h
+    wx/artprov.h
+    wx/bitmap.h
+    wx/busyinfo.h
+    wx/calctrl.h
+    wx/caret.h
+    wx/clipbrd.h
+    wx/cmdproc.h
+    wx/colordlg.h
+    wx/colour.h
+    wx/cshelp.h
+    wx/dataobj.h
+    wx/dbgrid.h
+    wx/dcbuffer.h
+    wx/dcps.h
+    wx/dialup.h
+    wx/dirctrl.h
+    wx/display.h
+    wx/dnd.h
+    wx/docmdi.h
+    wx/docview.h
+    wx/dragimag.h
+    wx/effects.h
+    wx/evtloop.h
+    wx/fdrepdlg.h
+    wx/fmappriv.h
+    wx/font.h
+    wx/fontdlg.h
+    wx/fontenum.h
+    wx/fontutil.h
+    wx/gdiobj.h
+    wx/geometry.h
+    wx/gifdecod.h
+    wx/glcanvas.h
+    wx/grid.h
+    wx/help.h
+    wx/helpbase.h
+    wx/helpwin.h
+    wx/iconbndl.h
+    wx/imagbmp.h
+    wx/image.h
+    wx/imaggif.h
+    wx/imagiff.h
+    wx/imagjpeg.h
+    wx/imaglist.h
+    wx/imagpcx.h
+    wx/imagpng.h
+    wx/imagpnm.h
+    wx/imagtiff.h
+    wx/imagxpm.h
+    wx/joystick.h
+    wx/laywin.h
+    wx/listbase.h
+    wx/listctrl.h
+    wx/matrix.h
+    wx/menuitem.h
+    wx/metafile.h
+    wx/minifram.h
+    wx/notebook.h
+    wx/ownerdrw.h
+    wx/paper.h
+    wx/popupwin.h
+    wx/print.h
+    wx/printdlg.h
+    wx/prntbase.h
+    wx/progdlg.h
+    wx/ptr_scpd.h
+    wx/quantize.h
+    wx/rawbmp.h
+    wx/region.h
+    wx/sashwin.h
+    wx/scopeguard.h
+    wx/spinbutt.h
+    wx/spinctrl.h
+    wx/splash.h
+    wx/splitter.h
+    wx/stack.h
+    wx/statline.h
+    wx/tab.h
+    wx/tabctrl.h
+    wx/taskbar.h
+    wx/tbarbase.h
+    wx/tbarsmpl.h
+    wx/tglbtn.h
+    wx/tipdlg.h
+    wx/tipwin.h
+    wx/tooltip.h
+    wx/toplevel.h
+    wx/treebase.h
+    wx/treectrl.h
+    wx/valgen.h
+    wx/vlbox.h
+    wx/vms_x_fix.h
+    wx/vscroll.h
+    wx/wave.h
+    wx/wizard.h
+    wx/xpmdecod.h
+    wx/xpmhand.h
+
+    wx/generic/dragimgg.h
+    wx/generic/gridsel.h
+
 </set>
 
 
@@ -389,12 +597,15 @@
     src/common/taskbarcmn.cpp
     src/unix/taskbarx11.cpp
     src/generic/printps.cpp
+    src/generic/caret.cpp
+    src/unix/dialup.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR">
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
     wx/unix/taskbarx11.h
     wx/generic/printps.h
+    wx/generic/caret.h
 </set>
 
 
@@ -437,6 +648,7 @@
 </set>
 <set var="GTK_LOWLEVEL_HDR">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/paletteg.h
 </set>
 <set var="GTK_SRC">
     <!-- Generic implementations used by wxGTK: -->
@@ -555,6 +767,7 @@
     wx/generic/tabg.h
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
+    wx/generic/listctrl.h
 </set>
 
 
@@ -811,7 +1024,6 @@
     src/msw/dirdlg.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
-    src/msw/helpbest.cpp
     src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
@@ -847,6 +1059,8 @@
 <set var="MSW_LOWLEVEL_HDR">
 </set>
 <set var="MSW_SRC">
+    src/generic/statusbr.cpp
+    src/msw/uxtheme.cpp
     src/msw/ole/access.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
@@ -873,7 +1087,6 @@
     src/msw/menuitem.cpp
     src/msw/metafile.cpp
     src/msw/msgdlg.cpp
-    src/msw/mslu.cpp
     src/msw/nativdlg.cpp
     src/msw/notebook.cpp
     src/msw/ownerdrw.cpp
@@ -896,10 +1109,8 @@
     src/msw/textctrl.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
-    src/msw/mslu.cpp
 </set>
 <set var="MSW_HDR">
-    wx/msw/access.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -935,7 +1146,6 @@
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
     wx/msw/glcanvas.h
-    wx/msw/helpbest.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
@@ -987,15 +1197,16 @@
     wx/msw/treectrl.h
     wx/msw/wave.h
     wx/msw/window.h
-    wx/msw/access.h
-    wx/msw/automtn.h
-    wx/msw/dataform.h
-    wx/msw/dataobj.h
-    wx/msw/dataobj2.h
-    wx/msw/dropsrc.h
-    wx/msw/droptgt.h
-    wx/msw/oleutils.h
-    wx/msw/uuid.h
+    wx/msw/ole/access.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/dataform.h
+    wx/msw/ole/dataobj.h
+    wx/msw/ole/dataobj2.h
+    wx/msw/ole/dropsrc.h
+    wx/msw/ole/droptgt.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/uuid.h
+    wx/msw/helpbest.h
 </set>
 
 
@@ -1030,6 +1241,7 @@
     src/mgl/window.cpp
     src/mgl/utils.cpp
     src/generic/timer.cpp
+    src/generic/caret.cpp
 </set>
 <set var="MGL_LOWLEVEL_HDR">
     wx/mgl/app.h
@@ -1054,6 +1266,7 @@
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/generic/timer.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1138,6 +1351,7 @@
     src/os2/window.cpp
     src/os2/gsocket.c
     src/os2/gsockpm.c
+    src/generic/caret.cpp
 </set>
 <set var="OS2_HDR">
     wx/os2/accel.h
@@ -1210,6 +1424,7 @@
     wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/toplevel.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1223,7 +1438,6 @@
 <set var="MAC_LOWLEVEL_HDR">
 </set>
 <set var="MAC_SRC">
-    src/mac/gsocket.c
     src/mac/accel.cpp
     src/mac/aga.cpp
     src/mac/app.cpp
@@ -1249,7 +1463,6 @@
     src/mac/dcscreen.cpp
     src/mac/dialog.cpp
     src/mac/dirdlg.cpp
-    src/mac/dirmac.cpp
     src/mac/dnd.cpp
     src/mac/filedlg.cpp
     src/mac/font.cpp
@@ -1267,7 +1480,6 @@
     src/mac/menu.cpp
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
-    src/mac/mimetmac.cpp
     src/mac/minifram.cpp
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
@@ -1296,8 +1508,6 @@
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/uma.cpp
-    src/mac/utils.cpp
-    src/mac/utilsexc.cpp
     src/mac/wave.cpp
     src/mac/window.cpp
     src/mac/morefilex/MoreFilesX.c
@@ -1308,11 +1518,12 @@
     src/generic/fdrepdlg.cpp
     src/generic/tabg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/caret.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
-    src/unix/utilsunx.cpp
 </set>
 <set var="MAC_HDR">
+    wx/mac/chkconf.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1400,6 +1611,7 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1423,12 +1635,13 @@
     src/cocoa/app.mm
     src/cocoa/bmpbuttn.mm
     src/cocoa/bitmap.mm
-    src/cocoa/brush.cpp
+    src/cocoa/brush.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/colour.mm
+    src/cocoa/combobox.mm
     src/cocoa/control.mm
     src/cocoa/cursor.mm
     src/cocoa/data.cpp
@@ -1440,6 +1653,7 @@
     src/cocoa/font.cpp
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
+    src/cocoa/gauge.mm
     src/cocoa/gdiobj.cpp
     src/cocoa/icon.cpp
     src/cocoa/listbox.mm
@@ -1452,6 +1666,7 @@
     src/cocoa/region.cpp
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
+    src/cocoa/spinbutt.mm
     src/cocoa/statbmp.mm
     src/cocoa/statbox.mm
     src/cocoa/statline2.mm
@@ -1461,6 +1676,23 @@
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
     src/cocoa/window.mm
+    <!-- Generic implementations used by wxCocoa: -->
+    src/generic/statusbr.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/tabg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/notebook.cpp
+    src/generic/accel.cpp
+    src/generic/paletteg.cpp
+    src/generic/timer.cpp
+    src/generic/caret.cpp
+    src/generic/mdig.cpp
 </set>
 <set var="COCOA_HDR">
     wx/cocoa/NSBox.h
@@ -1482,6 +1714,7 @@
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/colour.h
+    wx/cocoa/combobox.h
     wx/cocoa/control.h
     wx/cocoa/cursor.h
     wx/cocoa/dc.h
@@ -1491,6 +1724,7 @@
     wx/cocoa/dialog.h
     wx/cocoa/font.h
     wx/cocoa/frame.h
+    wx/cocoa/gauge.h
     wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
@@ -1500,6 +1734,7 @@
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
+    wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/statline.h
@@ -1507,6 +1742,16 @@
     wx/cocoa/textctrl.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
+    <!-- Generic implementations used by wxCocoa: -->
+    wx/generic/statusbr.h
+    wx/generic/fontdlgg.h
+    wx/generic/imaglist.h
+    wx/generic/listctrl.h
+    wx/generic/fdrepdlg.h
+    wx/generic/tabg.h
+    wx/generic/caret.h
+    wx/generic/mdig.h
+    wx/generic/paletteg.h
 </set>
 
 
@@ -1515,7 +1760,7 @@
 <!--                              wxUniversal                               -->
 <!-- ====================================================================== -->
 
-     
+
 <set var="UNIV_THEMES_SRC">
     src/univ/themes/gtk.cpp
     src/univ/themes/win32.cpp
@@ -1565,7 +1810,6 @@
     src/univ/toolbar.cpp
     src/univ/theme.cpp
     src/univ/winuniv.cpp
-    src/generic/caret.cpp
     src/generic/mdig.cpp
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
@@ -1618,7 +1862,6 @@
     wx/univ/theme.h
     wx/univ/toolbar.h
     wx/univ/window.h
-    wx/generic/caret.h
     wx/generic/mdig.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
@@ -1626,6 +1869,7 @@
     wx/generic/dirdlgg.h
     wx/generic/statusbr.h
     wx/generic/accel.h
+    wx/generic/listctrl.h
 </set>
 
 
@@ -1634,7 +1878,13 @@
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
 
+<set var="HTML_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">
+        src/msw/helpbest.cpp
+    </if>
+</set>
 <set var="HTML_SRC">
+    $(HTML_SRC_PLATFORM)
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
     src/html/helpctrl.cpp
@@ -1655,10 +1905,49 @@
     src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/htmprint.cpp
+    <!-- wxHTML users: -->
+    src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR">
+    wx/wxhtml.h
+    wx/html/forcelnk.h
+    wx/html/helpctrl.h
+    wx/html/helpdata.h
+    wx/html/helpfrm.h
+    wx/html/htmlcell.h
+    wx/html/htmldefs.h
+    wx/html/htmlfilt.h
+    wx/html/htmlpars.h
+    wx/html/htmlproc.h
+    wx/html/htmltag.h
+    wx/html/htmlwin.h
+    wx/html/htmprint.h
+    wx/html/m_templ.h
+    wx/html/winpars.h
+    <!-- wxHTML users: -->
+    wx/htmllbox.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                             OpenGL canvas                              -->
+<!-- ====================================================================== -->
+
+<set var="OPENGL_SRC">
+    <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
 </set>
 
+<set var="OPENGL_HDR">
+    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+</set>
 
 
 
@@ -1666,23 +1955,38 @@
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
+    <!-- Nested if would be nicer, but this works -->
+    <set var="BASE_MACOSX_SRC">
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+    </set>
     <set var="BASE_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+    </set>
+    <set var="BASE_AND_GUI_PLATFORM_SRC">
+        <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_DARWIN_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_HDR">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
 
-    
     <set var="BASE_SRC">
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
-    
-    
+    <set var="BASE_AND_GUI_SRC">
+        $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
+    </set>
+
+
     <set var="LOWLEVEL_SRC">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
@@ -1703,7 +2007,6 @@
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
-    
 
     <set var="GUI_SRC">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
@@ -1723,20 +2026,27 @@
     </set>
 
     <set var="CORE_SRC">
-        <if cond="USE_GUI=='0'">
-            src/common/init.cpp
-        </if>
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(LOWLEVEL_SRC) $(GUI_SRC) $(GUICMN_SRC)
+            $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>
         <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUICMN_SRC)
+            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
 
+
+    <set var="ALL_GUI_HEADERS">
+        <if cond="USE_GUI=='1' and WXUNIV=='0'">
+            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
+        </if>
+        <if cond="USE_GUI=='1' and WXUNIV=='1'">
+            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
+        </if>
+    </set>
+    
     <set var="ALL_HEADERS">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
-        $(GUICMN_HDR) $(GUI_HDR) $(LOWLEVEL_HDR)
+        $(ALL_GUI_HEADERS)
         $(HTML_HDR)
     </set>