X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdcc580c3d4c62277b01b0b6089c49610c4f2aee..be7c2a2033f57f92c23f0db8220cb53ad47eabde:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 3a0e66982c..197f1b4d7a 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-<!-- Master bakefile for wxWindows -->
+<!-- Master bakefile for wxWidgets -->
 
 <makefile>
 
@@ -19,10 +19,18 @@
     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>
     
-    <!-- wxWindows variant where everything is in one library: -->
+    <!-- wxWidgets variant where everything is in one library: -->
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
+
+    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+        <set var="MSVC6PRJ_MERGED_TARGETS">
+            <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
+            <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
+        </set>
+    </if>
+    
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
     <!-- Dynamically loadable plugins: -->
@@ -32,10 +40,33 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
     </subproject>
-
-    <if cond="FORMAT=='autoconf'">       
+    
+    <if cond="FORMAT=='autoconf'">
+    
+        <!-- WXRC compiler is built by default: -->
+        <!-- FIXME: this is dirty hack, better bakefile support for
+             conditional and optional subprojects is needed -->
+        <action id="wxrc" cond="USE_XRC=='1'">
+            <dependency-of>all</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+            </command>
+        </action>
+        <action id="clean-wxrc" cond="USE_XRC=='1'">
+            <dependency-of>clean</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+            </command>
+        </action>
+        <action id="install-wxrc" cond="USE_XRC=='1'">
+            <dependency-of>install</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+            </command>
+        </action>
+    
         <!-- "make install": -->
 
         <data-files>
@@ -43,33 +74,28 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
-        <data-files-tg id="install-afm" cond="USE_GUI=='1'">
-            <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/afm</install-to>
-        </data-files-tg>
-        <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
-            <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/gs_afm</install-to>
-        </data-files-tg>
-
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(BINDIR)
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
+                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
             </command>
         </action>
 
         <data-files>
             <srcdir>$(BUILDDIR)</srcdir>
-            <files>lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h</files>
-            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_NAME)/wx</install-to>
+            <files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
+            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
         </data-files>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
+            <install-to>
+                $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+            </install-to>
         </headers>
 
         <!-- Locales: -->
@@ -125,8 +151,8 @@
     </if>
 
 
-    <!-- copy setup.h on Windows: -->    
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+    <!-- copy setup.h on DOS/Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -142,7 +168,7 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0'">msw</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">
@@ -167,15 +193,15 @@
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
-@echo " The installation of wxWindows is finished.  On certain"
+@echo " The installation of wxWidgets 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 " wxWidgets 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 " Read the wxWidgets Licence on licencing conditions."
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "