Put printdc.cpp into all GUI builds because there's not a way

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index afaf248b3619508c50e6aa3c6f51090403c455ed..11ccec8d771ae72367accbb0c700523665b3cf86 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -53,7 +53,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
+    wx/unix/apptbase.h
+    wx/unix/apptrait.h
+    wx/unix/execute.h
     wx/unix/mimetype.h
+    wx/unix/pipe.h
 </set>
 
 <set var="BASE_WIN32_SRC" hints="files">
@@ -75,6 +79,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/volume.cpp
 </set>
 <set var="BASE_WIN32_HDR" hints="files">
+    wx/msw/apptrait.h
+    wx/msw/apptbase.h
     wx/msw/chkconf.h
     wx/msw/crashrpt.h
     wx/msw/dde.h
@@ -101,10 +107,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_MAC_SRC" hints="files">
     src/mac/dirmac.cpp
     src/mac/mimetmac.cpp
-    src/mac/utils.cpp
-    src/mac/utilsexc.cpp
     src/unix/baseunix.cpp
+    src/mac/utilsexc.cpp
 </set>
+
+<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+    src/mac/utils.cpp
+</set>
+
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
@@ -215,6 +225,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/fs_zip.h
     wx/hash.h
     wx/hashmap.h
+    wx/hashset.h
     wx/iconloc.h
     wx/init.h
     wx/intl.h
@@ -240,7 +251,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/object.h
     wx/platform.h
     wx/process.h
+    wx/ptr_scpd.h
     wx/regex.h
+    wx/scopeguard.h
     wx/snglinst.h
     wx/stopwatch.h
     wx/strconv.h
@@ -251,6 +264,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
+    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
@@ -418,6 +432,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/progdlgg.cpp
+    src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/scrlwing.cpp
     src/generic/selstore.cpp
@@ -469,6 +484,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
+    wx/generic/printps.h
     wx/generic/progdlgg.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
@@ -502,7 +518,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h
-    wx/timer.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
@@ -605,7 +620,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
     src/generic/caret.cpp
-    src/generic/printps.cpp
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
@@ -613,7 +627,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
-    wx/generic/printps.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
 </set>
@@ -1044,6 +1057,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
+    src/msw/printdlg.cpp
+    src/msw/printwin.cpp
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
@@ -1087,9 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
-    src/msw/penwin.cpp
-    src/msw/printdlg.cpp
-    src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/scrolbar.cpp
@@ -1801,17 +1813,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/themes/win32.cpp
 </set>
 
-<!-- don't ask... wxX11 must have something extra I guess -->
-<set var="UNIV_TEXTCTRL">
-<!--    <if cond="TOOLKIT=='X11'">src/x11/textctrl.cpp</if> -->
-    <if cond="TOOLKIT=='X11'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MGL'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='GTK'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MSW'">src/univ/textctrl.cpp</if>
-</set>
-
 <set var="UNIV_SRC" hints="files">
-    $(UNIV_TEXTCTRL)
     src/generic/accel.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
@@ -1853,6 +1855,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
+    src/univ/textctrl.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
@@ -2122,6 +2125,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
     </set>
+    <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
+        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+    </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
@@ -2138,7 +2144,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
     <set var="BASE_AND_GUI_SRC" hints="files">
-        $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
     </set>
     
     
@@ -2237,21 +2244,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 
+    <set var="GUI_CORE_HEADERS" hints="files">
+        <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
+        <if cond="USE_GUI=='1' and WXUNIV=='1'">$(UNIV_HDR)</if>
+    </set>
+
     <set var="ALL_GUI_HEADERS" hints="files">
-        <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 cond="USE_GUI=='1'">
+            $(GUI_CMN_HDR)
+            $(LOWLEVEL_HDR)
+            $(GUI_CORE_HEADERS)
+            $(ADVANCED_HDR) $(HTML_HDR)
+            $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
         </if>
     </set>
+        
 
-    <set var="ALL_HEADERS" make_var="1" hints="files">
+    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(ALL_GUI_HEADERS) $(ADVANCED_HDR)
-        $(HTML_HDR) $(XML_HDR)
-        $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
+        $(XML_HDR)
+    </set>
+
+    <set var="ALL_HEADERS" make_var="1" hints="files">
+        $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
+    </set>
+
+    <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
+        $(BASE_CMN_SRC)
+        $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
+        $(BASE_OS2_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_UNIX_SRC)
+        $(BASE_AND_GUI_MAC_SRC)
+        $(BASE_AND_GUI_DARWIN_SRC)
+        $(BASE_AND_GUI_WIN32_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
+        $(XML_SRC)
     </set>
 
 </makefile>