no need to define STRICT here either

[wxWidgets.git] / build / bakefiles / files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f7f99d1fcc931f817776c45e3f34d75d2857bef0..1c874bbaf8719cbb6bb60429cf37709bbc71e1af 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -20,7 +20,8 @@
                                
        $(port)LOWLEVEL               low-level GUI classes
        $(port)                       high-level files for a port
-       XWIN_LOWLEVEL                 low-level classes for X Window System port
+       XWIN_LOWLEVEL                 low-level classes for X Window System 
+                                     ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
   
@@ -99,9 +100,6 @@
     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>
 
@@ -186,6 +184,7 @@
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR">
+    wx/init.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
@@ -207,6 +206,7 @@
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
+    wx/arrstr.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
@@ -944,7 +944,6 @@
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR">
-    wx/msw/access.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -1031,15 +1030,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>
 
 
@@ -1356,6 +1356,7 @@
     src/unix/snglinst.cpp
 </set>
 <set var="MAC_HDR">
+    wx/mac/chkconf.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1467,12 +1468,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
@@ -1484,6 +1486,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
@@ -1496,6 +1499,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
@@ -1521,6 +1525,7 @@
     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
@@ -1542,6 +1547,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
@@ -1551,6 +1557,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
@@ -1560,6 +1567,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
@@ -1575,6 +1583,7 @@
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
     wx/generic/caret.h
+    wx/generic/mdig.h
 </set>
 
 
@@ -1700,7 +1709,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
@@ -1722,7 +1737,6 @@
     src/html/m_style.cpp
     src/html/htmprint.cpp
     <!-- wxHTML users: -->
-    src/msw/helpbest.cpp
     src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR">
@@ -1741,7 +1755,6 @@
     wx/html/m_templ.h
     wx/html/winpars.h
     <!-- wxHTML users: -->
-    wx/msw/helpbest.h
     wx/htmllbox.h
 </set>
 
@@ -1752,19 +1765,22 @@
 <!--                    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_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>
+        <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="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_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>