From d6518e3ef77d8f3f464c8c777664425630b838a6 Mon Sep 17 00:00:00 2001
From: Kevin Ollivier <kevino@theolliviers.com>
Date: Fri, 8 Jun 2007 18:25:40 +0000
Subject: [PATCH] Bakefile only supports 'and' conditions, so refactor the
 debug conditions to reflect that.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/wxpresets/presets/wx_win32.bkl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 157bc02e59..3c65bc3a83 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -140,7 +140,8 @@ FIXME: this template has (at least) the following bugs:
     <!--    The debug define we need with win32 compilers           -->
     <!--    (on Linux, the wx-config program is used).              -->
     <set var="WXDEBUG_DEFINE">
-        <if cond="WX_PYTHON=='1' or WX_DEBUG=='1'">__WXDEBUG__</if>
+        <if cond="WX_PYTHON=='1'">__WXDEBUG__</if>
+        <if cond="WX_PYTHON=='0' and WX_DEBUG=='1'">__WXDEBUG__</if>
     </set>
 
     <!--    These are handy ways of dealing with the                -->