more sorting

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index f1c07ee5540e69f93cb1dca5a8b67edf3168b426..2a772ccfdc166061142ec47c66fdc7de88bde879 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -18,6 +18,8 @@
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
     <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'): -->
     
     
     <!-- Samples target (not dependency of 'all'): -->


@@ -92,18 +94,26 @@
     <!-- copy setup.h on Windows: -->    
     <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
         <mkdir id="libdir">
     <!-- copy setup.h on Windows: -->    
     <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
         <mkdir id="libdir">

+            <dir>$(LIBDIRNAME)</dir>
+        </mkdir>
+        <mkdir id="libdir_wx">
+            <depends>libdir</depends>

             <dir>$(LIBDIRNAME)/wx</dir>
         </mkdir>
             <dir>$(LIBDIRNAME)/wx</dir>
         </mkdir>

+        

         <copy-file-to-file 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>
         <copy-file-to-file 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</depends>
+            <depends>libdir_wx</depends>

             <src>$(SRCDIR)/include/wx/msw/setup.h</src>
             <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
         </copy-file-to-file>
             <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>

     </if>
 
 </makefile>
     </if>
 
 </makefile>