Regenerated the renamers with the new build_renamers.py

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index c89a65e59d4fd321026fb09d98e0d9b4b0d7682a..38be4fa52223f332563cefc5372935199782ee28 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -157,7 +157,13 @@
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
         <set var="CFG_NAME_PART">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>

-        <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
+        <set var="OBJS" make_var="1">
+            <if cond="FORMAT!='cbuilderx'">$(COMPILER)_$(CFG_NAME_PART)</if>
+            <!-- FIXME: waiting for removal after CBX has better ../ dirs
+                 support -->
+            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
+        </set>
+

         <set var="BUILDDIR">$(OBJS)</set>
     </if>
     
         <set var="BUILDDIR">$(OBJS)</set>
     </if>
     


@@ -198,11 +204,20 @@
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>

+    <set var="EXCEPTIONSFLAG">
+        <if cond="USE_EXCEPTIONS=='1'">on</if>
+        <if cond="USE_EXCEPTIONS=='0'">off</if>
+    </set>

 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>

+    <!-- does not cover all cases, but better than nothing -->
+    <set var="NO_VC_CRTDBG">
+        <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
+        <if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
+    </set>

     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </set>


@@ -217,9 +232,12 @@
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>

+        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>

         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>

+        <define>$(NO_VC_CRTDBG)</define>

     </template>
     
     <template id="anylib">
     </template>
     
     <template id="anylib">


@@ -261,7 +279,9 @@
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>

-        <include>$(TOP_SRCDIR)include</include>
+        <!-- this include is added by configure, we need to put other
+             includes before it: -->
+        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>

         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>


@@ -283,11 +303,10 @@
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>

-            <if cond="COMPILER=='bcc'">
-                <sys-lib>import32</sys-lib>
+            <if cond="FORMAT=='borland'">

                 <sys-lib>ole2w32</sys-lib>
             </if>
                 <sys-lib>ole2w32</sys-lib>
             </if>

-            <if cond="COMPILER!='bcc'">
+            <if cond="FORMAT!='borland'">

                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>


@@ -304,10 +323,10 @@
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>

-            <if cond="COMPILER=='vc' or COMPILER=='bcc'">
+            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">

                 <sys-lib>oleacc</sys-lib>
             </if>
                 <sys-lib>oleacc</sys-lib>
             </if>

-        </if>        
+        </if>

     </template>
 
     <define-tag name="msvc-headers" rules="dll,lib">
     </template>
 
     <define-tag name="msvc-headers" rules="dll,lib">