Use wxUniv textctrl for wxX11

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 2738821ff28cb661e8ab30233be8aa7d2ca846ff..14edf7dfbcc64f938e83c1c52f0a58b51bf212e6 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -6,6 +6,11 @@
 
 <makefile>
 
+    <!-- make sure setup.h is created as soon as possible: -->
+    <phony id="setup_h" cond="FORMAT!='autoconf'">
+        <dependency-of>all</dependency-of>
+    </phony>
+
     <set var="BUILDING_LIB">1</set>
 
     <!-- common rules, names etc. for wx: -->
@@ -18,6 +23,8 @@
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
+    <!-- OpenGL canvas is built as separate library in both cases: -->
+    <include file="opengl.bkl"/>
     
     
     <!-- Samples target (not dependency of 'all'): -->
@@ -96,22 +103,20 @@
         </mkdir>
         <mkdir id="libdir_wx">
             <depends>libdir</depends>
-            <dir>$(LIBDIRNAME)/wx</dir>
+            <dependency-of>setup_h</dependency-of>
+            <dir>$(LIBDIRNAME)/wx</dir>            
         </mkdir>
         
-        <copy-file-to-file id="msw/setup.h">
+        <copy-file-to-file-if-not-exist id="msw/setup.h">
             <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
             <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
-        </copy-file-to-file>
-        <copy-file-to-file id="setup.h">
-            <depends>msw/setup.h</depends>
-            <depends>libdir_wx</depends>
+            <dependency-of>setup_h</dependency-of>
+        </copy-file-to-file-if-not-exist>
+        <copy-file-to-file-if-not-exist id="setup.h">
+            <dependency-of>setup_h</dependency-of>
             <src>$(SRCDIR)/include/wx/msw/setup.h</src>
             <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
-        </copy-file-to-file>
-        <phony id="setup_h">
-            <depends>setup.h</depends>
-        </phony>
+        </copy-file-to-file-if-not-exist>
     </if>
 
 </makefile>