Use $(OutDir) instead of explicit directories in VC10 project files.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index befd8fe351c8a524d791a173a82d54fb20984b68..457f8d3e99d5a8b2fdae940bddc67c8fdd31f776 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <makefile>
 
 <!--
@@ -73,6 +72,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/wakeuppipe.cpp
     src/unix/fswatcher_kqueue.cpp
 </set>
 
@@ -405,6 +405,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/clntdata.h
     wx/cmdargs.h
     wx/cmdline.h
+    wx/compiler.h
     wx/confbase.h
     wx/config.h
     wx/convauto.h
@@ -1275,7 +1276,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/treeentry_gtk.h
 </set>
 <set var="GTK2_HDR" hints="files">
     $(GTK_HDR)
@@ -3250,9 +3250,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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
@@ -3263,6 +3262,9 @@ and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
     <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