Really fix wxUSE_PREFERENCES_EDITOR requirements check.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 9a9f452a88b81ee6d8766b6e6c2c1d1589976d27..1974ae70e2a49c9ed930616499510ae81620868f 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -73,6 +73,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/timerunx.cpp
     src/unix/threadpsx.cpp
     src/unix/utilsunx.cpp
     src/unix/timerunx.cpp
     src/unix/threadpsx.cpp
     src/unix/utilsunx.cpp

+    src/unix/wakeuppipe.cpp

     src/unix/fswatcher_kqueue.cpp
 </set>
 
     src/unix/fswatcher_kqueue.cpp
 </set>
 


@@ -405,6 +406,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/clntdata.h
     wx/cmdargs.h
     wx/cmdline.h
     wx/clntdata.h
     wx/cmdargs.h
     wx/cmdline.h

+    wx/compiler.h

     wx/confbase.h
     wx/config.h
     wx/convauto.h
     wx/confbase.h
     wx/config.h
     wx/convauto.h


@@ -709,6 +711,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/markupparser.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp
     src/common/markupparser.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp

+    src/common/modalhook.cpp

     src/common/mousemanager.cpp
     src/common/nbkbase.cpp
     src/common/overlaycmn.cpp
     src/common/mousemanager.cpp
     src/common/nbkbase.cpp
     src/common/overlaycmn.cpp


@@ -867,6 +870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/listbox.h
     wx/mdi.h
     wx/menu.h
     wx/listbox.h
     wx/mdi.h
     wx/menu.h

+    wx/modalhook.h

     wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
     wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h


@@ -1273,7 +1277,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/textctrl.h
     wx/gtk/textentry.h
     wx/gtk/tglbtn.h
     wx/gtk/textctrl.h
     wx/gtk/textentry.h
     wx/gtk/tglbtn.h

-    wx/gtk/treeentry_gtk.h

 </set>
 <set var="GTK2_HDR" hints="files">
     $(GTK_HDR)
 </set>
 <set var="GTK2_HDR" hints="files">
     $(GTK_HDR)


@@ -3248,9 +3251,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
 <!--
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
 <!--

-Don't include src/generic/animateg.cpp many times in ADVANCED_SRC(WXUNIV=='1').
-This file is already included in [OSX_CARBON, OSX_COCOA, OSX_IPHONE, COCOA, PM, MOTIF] TOOLKITs
-and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
+    Including src/generic/animateg.cpp hre unconditionally results in bakefile
+    errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.

 -->
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/generic/animateg.cpp
 -->
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/generic/animateg.cpp


@@ -3261,6 +3263,9 @@ and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
     <if cond="TOOLKIT=='WINCE'">
         src/generic/animateg.cpp
     </if>
     <if cond="TOOLKIT=='WINCE'">
         src/generic/animateg.cpp
     </if>

+    <if cond="TOOLKIT=='X11'">
+        src/generic/animateg.cpp
+    </if>

 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h
 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h