Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two common case of hybrid build:

Browse Source 
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
This commit is contained in:
Mattia Barbon
2003-09-12 22:34:06 +00:00
parent d19d1899fc
commit 4435bd4270
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bakefiles/common.bkl
View File

@@ -203,6 +203,11 @@
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if> <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if> <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
</set> </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"> <set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set> </set>
@@ -220,6 +225,7 @@
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags> <cppflags>$(EXTRACFLAGS)</cppflags>
</if> </if>
<define>$(NO_VC_CRTDBG)</define>
</template> </template>
<template id="anylib"> <template id="anylib">