reference to technote

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 4d30154a412ce22b6fbcc272ba31a76626b26b06..14edf7dfbcc64f938e83c1c52f0a58b51bf212e6 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -6,6 +6,11 @@
 
 <makefile>
 
 
 <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: -->
     <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"/>
     <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'): -->


@@ -72,7 +79,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
             <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>
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>


@@ -92,18 +99,24 @@
     <!-- 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)/wx</dir>
+            <dir>$(LIBDIRNAME)</dir>
+        </mkdir>
+        <mkdir id="libdir_wx">
+            <depends>libdir</depends>
+            <dependency-of>setup_h</dependency-of>
+            <dir>$(LIBDIRNAME)/wx</dir>            

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

-        </copy-file-to-file>
+        </copy-file-to-file-if-not-exist>

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