fixed DSW dependencies for samples

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 712d01378c33e82b085ace53f98b8e205c4b0d94..55e51884baaec42559ace2915847d3452630e566 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,14 +23,16 @@
     <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'): -->
-    <!-- [ FIXME disabled; currently causes make install to go into samples ]
     <subproject id="samples">
-        <dir>samples</dir>
+        <installable>no</installable>
+        <dir cond="FORMAT=='autoconf'">samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
     </subproject>
-    -->
 
     <if cond="FORMAT=='autoconf'">       
         <!-- "make install": -->
@@ -72,7 +79,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>
@@ -85,7 +92,73 @@
                 $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
             </command>
         </action>
+        <action id="cocoa-res" cond="TOOLKIT=='COCOA'">
+            <dependency-of>all</dependency-of>
+            <set var="__targetname">$(MACOS_R)</set>
+            <command>
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
+                $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
+            </command>
+            <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
+        </action>
+        <action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
+            <dependency-of>install</dependency-of>
+            <depends>macos-res</depends>
+            <command>
+                $(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
+                $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
+            </command>
+        </action>
+
+    </if>
+
 
+    <!-- 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>
+            <dependency-of>setup_h</dependency-of>
+            <dir>$(LIBDIRNAME)/wx</dir>            
+        </mkdir>
+
+        <set var="SETUP_H_DIR">
+            <if cond="WXUNIV=='1'">univ</if>
+            <if cond="WXUNIV=='0'">msw</if>
+        </set>
+        
+        <copy-file-to-file-if-not-exist id="master_setup.h">
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</dst>
+            <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/$(SETUP_H_DIR)/setup.h</src>
+            <dst>$(LIBDIRNAME)/wx/setup.h</dst>
+        </copy-file-to-file-if-not-exist>
+    </if>
+
+
+    <!-- Show this banner after installation: -->
+    <if cond="FORMAT=='autoconf'">
+        <modify-target target="install">
+            <command>
+@echo " "
+@echo " The installation of wxWindows is finished.  On certain"
+@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+@echo " if you installed a shared library and also modify the"
+@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
+@echo " "
+@echo " wxWindows comes with no guarantees and doesn't claim"
+@echo " to be suitable for any purpose."
+@echo " "
+@echo " Read the wxWindows Licence on licencing conditions."
+@echo " "
+            </command>
+        </modify-target>
     </if>
 
 </makefile>