X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cd612f94410142bf9bf64158e980d2537d2ca93..cea4cc794274ae3dcd20133f009d74eaaa7d1c1e:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 4d30154a41..2a772ccfdc 100644
--- 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"/>
+    <!-- OpenGL canvas is built as separate library in both cases: -->
+    <include file="opengl.bkl"/>
     
     
     <!-- Samples target (not dependency of 'all'): -->
@@ -72,7 +74,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
-                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r ../src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
@@ -92,18 +94,26 @@
     <!-- 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>
+        
         <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>
+        <phony id="setup_h">
+            <depends>setup.h</depends>
+        </phony>
     </if>
 
 </makefile>