naming convention fixes

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index abc22743582940154b2412df5b9c6afbb0450fbf..4d30154a412ce22b6fbcc272ba31a76626b26b06 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -17,7 +17,7 @@
     <!-- wxWindows variant where everything is in one library: -->
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
-    <!-- <include file="multilib.bkl"/> -->
+    <include file="multilib.bkl"/>
     
     
     <!-- Samples target (not dependency of 'all'): -->
@@ -88,4 +88,22 @@
 
     </if>
 
+
+    <!-- copy setup.h on Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+        <mkdir id="libdir">
+            <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>
+            <depends>libdir</depends>
+            <src>$(SRCDIR)/include/wx/msw/setup.h</src>
+            <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
+        </copy-file-to-file>
+    </if>
+
 </makefile>