Fix two common case of hybrid build:

standard debugging build with non-debugging MSVCRT
release build with __WXDEBUG__ and non-debugging MSVCRT.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3934f9591301708cc4b69a4b1250ff431b9012fd..9f55b3213a52707f5dc83aba2353bda3b6fad843 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -203,6 +203,11 @@
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
         <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
     </set>
         <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>


@@ -220,6 +225,7 @@
         <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">