X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/846704576ca18eb87d2529093e21f0c527dcb4b8..5646c3f82d3f1b1ed8c2635f1ee86f81f715f896:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bf106ed8c4..5fe9c284b8 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -57,7 +57,6 @@
     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
@@ -67,6 +66,7 @@
     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>
@@ -77,9 +77,30 @@
     wx/msw/winundef.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_AND_GUI_MAC_SRC">
+    src/unix/utilsunx.cpp
 </set>
 <set var="BASE_MAC_HDR">
 </set>
@@ -122,6 +143,7 @@
     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
@@ -158,10 +180,10 @@
     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
-    src/common/event.cpp
 </set>
 <set var="BASE_CMN_HDR">
     wx/arrimpl.cpp
@@ -178,6 +200,7 @@
     wx/datetime.inl
     wx/datstrm.h
     wx/db.h
+    wx/dbkeyg.h
     wx/dbtable.h
     wx/dde.h
     wx/debug.h
@@ -200,10 +223,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
@@ -240,7 +263,6 @@
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
-    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/url.h
@@ -289,6 +311,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
@@ -832,7 +856,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
@@ -868,6 +891,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
@@ -916,7 +941,6 @@
     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
@@ -955,7 +979,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
@@ -1243,7 +1266,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
@@ -1269,7 +1291,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
@@ -1287,7 +1308,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
@@ -1316,8 +1336,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
@@ -1330,7 +1348,6 @@
     src/generic/fontdlgg.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
-    src/unix/utilsunx.cpp
 </set>
 <set var="MAC_HDR">
     wx/mac/accel.h
@@ -1488,8 +1505,14 @@
     src/generic/fdrepdlg.cpp
     src/generic/tabg.cpp
     src/generic/fontdlgg.cpp
-    <!-- Unix files used by wxCocoa: -->
-    src/unix/snglinst.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
 </set>
 <set var="COCOA_HDR">
     wx/cocoa/NSBox.h
@@ -1691,8 +1714,28 @@
     src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/htmprint.cpp
+    <!-- wxHTML users: -->
+    src/msw/helpbest.cpp
+    src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR">
+    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/msw/helpbest.h
+    wx/htmllbox.h
 </set>
 
 
@@ -1704,18 +1747,23 @@
 
     <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>
+        <!-- FIXME: this should really be 
+                    PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_MAC_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(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">
@@ -1746,7 +1794,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>
@@ -1766,9 +1813,6 @@
     </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) $(GUI_CMN_SRC)
         </if>