X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/004779cd73a2d523723576c7f75f804b89e24d26..a87bf37838e09fb4634a887cc8a6055104b49a01:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index c21d88a773..eab78dd712 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>
 
@@ -12,21 +12,30 @@
     </phony>
 
     <set var="BUILDING_LIB">1</set>
-
+    
     <!-- common rules, names etc. for wx: -->
     <include file="common.bkl"/>
-
+    
     <!-- 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: -->
+    <include file="plugins.bkl"/>
+ 
     <!-- Samples target (not dependency of 'all'): -->
     <subproject id="samples">
         <installable>no</installable>
@@ -55,8 +64,11 @@
             <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/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
+                $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
             </command>
         </action>
 
@@ -90,7 +102,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 $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/corersrc.r -o $(MACOS_RSRC)
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
@@ -154,6 +166,7 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
+
     </if>
 
 
@@ -165,15 +178,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 " "
@@ -187,5 +200,7 @@
         <fragment format="autoconf" file="make_dist.mk"/>
 
     </if>
+        
+    <include file="build_cfg.bkl"/>
 
 </makefile>