adding compatibility mode fallback for custom window definition procs that don't...

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index d92d892f2c14df3dd1d34861852afc9bc5a61fa0..c85d937d961c761760565aafc60be015304c4190 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
 <!-- $Id$ -->
 
 

-<!-- Master bakefile for wxWindows -->
+<!-- Master bakefile for wxWidgets -->

 
 <makefile>
 
 
 <makefile>
 


@@ -19,10 +19,18 @@
     <!-- list of files sorted into categories: -->
     <include file="files.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"/>
     <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: -->
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
     <!-- Dynamically loadable plugins: -->


@@ -91,7 +99,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 $(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>
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>


@@ -167,15 +175,15 @@
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
 @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 " 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 " 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 " "
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "