X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fcba069d8b3b26ec4d756215ea23d3ce3a5553d..874cc42557bea53e2e503a7d1978e84a4a8034d3:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index a0f53679f3..bc0ec3d4dd 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -30,6 +30,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
        XWIN_LOWLEVEL                 low-level classes for X Window System
                                      ports (wxGTK, wxMotif, wxX11)
 
+       MSW_DESKTOP                   files used only on desktop Windows
+                                     versions and not under Windows CE
+
+       xxx_NATIVE                    native files not used by wxUniv (used as
+                                     complement of LOWLEVEL when most of the
+                                     files are lowlevel and only few are native)
+
        HTML                          wxHTML files
        XRC                           wxXRC files
 
@@ -43,11 +50,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               UNIX                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
+    src/unix/dlunix.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
+    src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
 </set>
@@ -60,18 +72,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
+    wx/unix/stackwalk.h
     wx/unix/stdpaths.h
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                             Windows                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp
+    src/msw/debughlp.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp
+    src/msw/dlmsw.cpp
     src/msw/mimetype.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
+    src/msw/stackwalk.cpp
+    src/msw/stdpaths.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
@@ -90,8 +110,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/chkconf.h
     wx/msw/crashrpt.h
     wx/msw/dde.h
+    wx/msw/debughlp.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
+    wx/msw/stackwalk.h
     wx/msw/winundef.h
     wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
@@ -100,6 +122,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                                Mac                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
+<set var="BASE_COREFOUNDATION_SRC" hints="files">
+    src/mac/corefoundation/cfstring.cpp
+    src/mac/corefoundation/stdpaths_cf.cpp
+</set>
+<set var="BASE_COREFOUNDATION_HDR" hints="files">
+    wx/mac/corefoundation/cfstring.h
+    wx/mac/corefoundation/stdpaths.h
+</set>
+
 <!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
 <!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC  -->
 <set var="BASE_MAC_SRC" hints="files">
@@ -111,14 +147,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- One would think MoreFilesX is only for OS X but it seems to
          apply to CarbonLib as well (FSRefMakeFSSpec) -->
     src/mac/carbon/morefilex/MoreFilesX.c
-    <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
+    $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_MAC_HDR" hints="files">
+    $(BASE_COREFOUNDATION_HDR)
+</set>
+<!-- Base and GUI files used by both OS X and CarbonLib -->
+<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+    src/mac/carbon/utils.cpp
+    src/mac/carbon/uma.cpp
 </set>
 
 <!-- Base files used by Classic (not CarbonLib or OS X builds) -->
 <!-- set var="BASE_MAC_CLASSIC_SRC">
 </set -->
+<!-- set var="BASE_MAC_CLASSIC_HDR">
+</set -->
 
 <!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
 <set var="BASE_MAC_CARBONLIB_SRC" hints="files">
@@ -132,27 +176,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/morefile/MoreFilesExtras.c
     src/mac/carbon/morefile/Search.c
 </set>
+<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
+</set -->
 
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MAC_OSX_SRC" hints="files">
     src/unix/baseunix.cpp
+    src/unix/dlunix.cpp
+    src/unix/stdpaths.cpp
 </set>
-
-<!-- Base and GUI files used by both OS X and CarbonLib -->
-<set var="BASE_AND_GUI_MAC_SRC" hints="files">
-    src/mac/carbon/utils.cpp
-    src/mac/carbon/uma.cpp
+<set var="BASE_MAC_OSX_HDR" hints="files">
+    wx/unix/stdpaths.h
 </set>
 
-<set var="BASE_MAC_HDR" hints="files">
-    <!-- Shared wxMac and wxCocoa files -->
-    include/wx/mac/corefoundation/cfstring.h
-    include/wx/mac/corefoundation/stdpaths.h
+<!-- Base files used by non-wxMac OS X builds -->
+<set var="BASE_DARWIN_SRC" hints="files">
+    $(BASE_UNIX_SRC)
+    $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_DARWIN_HDR" hints="files">
+    $(BASE_UNIX_HDR)
+    $(BASE_COREFOUNDATION_HDR)
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               OS/2                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/mimetype.cpp
+    src/os2/stdpaths.cpp
     src/os2/thread.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
@@ -160,10 +213,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_AND_GUI_OS2_SRC" hints="files">
 </set>
 <set var="BASE_OS2_HDR" hints="files">
+    wx/os2/apptbase.h
+    wx/os2/apptrait.h
+    wx/os2/mimetype.h
+    wx/os2/stdpaths.h
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                              Common                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
+    src/common/archive.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
@@ -209,7 +270,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/textfile.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
-    src/common/unzip.c
     src/common/uri.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
@@ -229,6 +289,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/afterstd.h
     wx/app.h
     wx/apptrait.h
+    wx/archive.h
     wx/arrimpl.cpp
     wx/arrstr.h
     wx/beforestd.h
@@ -299,6 +360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h
+    wx/stackwalk.h
     wx/stdpaths.h
     wx/stockitem.h
     wx/stopwatch.h
@@ -368,7 +430,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/gsocket.cpp
 </set>
 <set var="NET_MAC_CARBONLIB_HDR" hints="files">
-    include/wx/mac/carbon/gsockmac.h
+    wx/mac/carbon/gsockmac.h
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -790,6 +852,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
+    src/gtk/filedlg.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
@@ -1132,7 +1195,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
-    src/msw/stdpaths.cpp
     src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
@@ -1143,14 +1205,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 
-<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/uuid.cpp
 </set>
 
-<set var="MSW_ONLY_LOWLEVEL_HDR" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">
     wx/msw/helpchm.h
     wx/msw/helpwin.h
 </set>
@@ -1334,11 +1396,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
-<set var="MSW_ONLY_SRC" hints="files">
+<set var="MSW_DESKTOP_SRC" hints="files">
     src/msw/fdrepdlg.cpp
     src/msw/fontdlg.cpp
 </set>
-<set var="MSW_ONLY_HDR" hints="files">
+<set var="MSW_DESKTOP_HDR" hints="files">
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
     wx/msw/helpbest.h
@@ -1607,10 +1669,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
+<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
+</set>
+
 <set var="MAC_LOWLEVEL_SRC" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
 </set>
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
+
+<set var="MAC_OSX_SRC" hints="files">
+<if cond="PLATFORM_MACOSX=='1'">
+    <!-- Unix files used by wxMac: -->
+    src/unix/snglinst.cpp
+    <!-- wxWebKit files -->
+    src/html/htmlctrl/webkit/webkit.mm
+    <!-- Native color/font dialogs -->
+    src/mac/carbon/fontdlgosx.mm
+    src/mac/carbon/colordlgosx.mm
+</if>
+</set>
+
 <set var="MAC_SRC" hints="files">
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
@@ -1647,7 +1729,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/frame.cpp
     src/mac/carbon/gauge.cpp
     src/mac/carbon/gdiobj.cpp
-    src/mac/carbon/gsockosx.cpp
     src/mac/carbon/hid.cpp
     src/mac/carbon/icon.cpp
     src/mac/carbon/listbox.cpp
@@ -1694,11 +1775,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
-    <!-- Unix files used by wxMac: -->
-    src/unix/snglinst.cpp
-    <!-- wxWebKit files -->
-    src/html/htmlctrl/webkit/webkit.mm
 </set>
+
 <!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
 <set var="MAC_CMN_HDR" hints="files">
     wx/mac/accel.h
@@ -1886,6 +1964,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
 </set>
 <set var="COCOA_LOWLEVEL_HDR" hints="files">
 </set>
@@ -1948,7 +2029,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/radiobut.mm
     src/cocoa/region.mm
     src/cocoa/scrolbar.mm
-    src/cocoa/settings.cpp
+    src/cocoa/settings.mm
     src/cocoa/slider.mm
     src/cocoa/sound.mm
     src/cocoa/spinbutt.mm
@@ -1957,6 +2038,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/statline2.mm
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm
+    src/cocoa/timer.mm
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
@@ -1977,12 +2059,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
-    src/generic/timer.cpp
-    <!-- wxMac stuff used by wxCocoa: -->
-    src/mac/carbon/gsockosx.cpp
-    <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2052,6 +2128,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
+    wx/cocoa/timer.h
     wx/cocoa/toolbar.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
@@ -2066,9 +2143,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/region.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
-    <!-- Shared wxMac and wxCocoa files -->
-    include/wx/mac/corefoundation/cfstring.h
-    include/wx/mac/corefoundation/stdpaths.h
 </set>
 
 
@@ -2187,6 +2261,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp
+    src/generic/datectlg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
@@ -2200,8 +2275,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
+    wx/dateevt.h
     wx/dcbuffer.h
     wx/generic/calctrl.h
+    wx/generic/datectrl.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
@@ -2222,6 +2299,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wizard.h
 </set>
 
+<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
+    wx/datectrl.h
+</set>
+
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/sound.cpp
@@ -2231,11 +2312,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>
+
+<!-- not used with wxUniv -->
+<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/datectrl.cpp
+</set>
+<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/datectrl.h
+</set>
+
 <!-- not built on WindowsCE: -->
-<set var="ADVANCED_MSW_ONLY_SRC" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">
     src/msw/joystick.cpp
 </set>
-<set var="ADVANCED_MSW_ONLY_HDR" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">
     wx/msw/joystick.h
 </set>
 
@@ -2258,7 +2348,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/taskbarcmn.cpp
 </set>
 <set var="ADVANCED_COCOA_HDR" hints="files">
-    include/wx/cocoa/taskbar.h
+    wx/cocoa/taskbar.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
@@ -2287,6 +2377,55 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/eggtrayicon.c
 </set>
 
+<!-- ====================================================================== -->
+<!--                               wxMedia                                  -->
+<!-- ====================================================================== -->
+
+<set var="MEDIA_CMN_SRC" hints="files">
+    src/common/mediactrlcmn.cpp
+</set>
+
+<set var="MEDIA_CMN_HDR" hints="files">
+    wx/mediactrl.h
+</set>
+
+<set var="MEDIA_MSW_SRC" hints="files">
+    src/msw/mediactrl.cpp
+</set>
+<set var="MEDIA_MSW_HDR" hints="files">
+</set>
+<!-- not built on WindowsCE: -->
+<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
+</set>
+<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
+</set>
+
+<set var="MEDIA_MAC_SRC" hints="files">
+    src/mac/carbon/mediactrl.cpp
+</set>
+<set var="MEDIA_MAC_HDR" hints="files">
+</set>
+
+<set var="MEDIA_COCOA_SRC" hints="files">
+    src/cocoa/mediactrl.mm
+</set>
+<set var="MEDIA_COCOA_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OS2_SRC" hints="files">
+</set>
+<set var="MEDIA_OS2_HDR" hints="files">
+</set>
+
+<set var="MEDIA_UNIX_SRC" hints="files">
+    src/unix/mediactrl.cpp
+</set>
+<set var="MEDIA_UNIX_HDR" hints="files">
+</set>
+
+<set var="MEDIA_GTK_SRC" hints="files">
+</set>
+
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
@@ -2362,6 +2501,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_chckl.cpp
     src/xrc/xh_choic.cpp
     src/xrc/xh_combo.cpp
+    src/xrc/xh_datectrl.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
     src/xrc/xh_gauge.cpp
@@ -2525,15 +2665,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- These are the files for PLATFORM_MACOSX -->
     <set var="BASE_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
         <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
         
         <!-- FIXME: a hack because there are two wxBase versions on
                     Mac; once fixed, this would no longer be needed -->
-        <if cond="TOOLKIT==''">$(BASE_UNIX_SRC)</if>
+        <if cond="TOOLKIT==''">$(BASE_DARWIN_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
@@ -2555,7 +2695,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR) $(BASE_MAC_OSX_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_HDR)</if>
     </set>
 
@@ -2594,7 +2734,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
@@ -2617,16 +2757,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
@@ -2644,7 +2784,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
@@ -2654,7 +2794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
@@ -2663,9 +2803,47 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
-    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
-    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
 
+    <!-- wxAdv files not used by wxUniv -->
+    <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+    </set>
+
+    <set var="ADVANCED_SRC" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+    </set>
+    <set var="ADVANCED_HDR" hints="files">
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+    </set>
+
+    <!-- wxMedia files: -->
+    <set var="MEDIA_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
+    </set>
+    <set var="MEDIA_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
+    </set>
+    <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
+    <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
 
 
     <set var="GUI_CORE_HEADERS" hints="files">
@@ -2678,7 +2856,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CMN_HDR)
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
-            $(ADVANCED_HDR) $(HTML_HDR)
+            $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
         </if>
     </set>