From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 16 Apr 2005 13:14:35 +0000 (+0000)
Subject: DEBUG_RUNTIME_LIBS depends on BUILD now, not DEBUG_INFO
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d33d6b82c3d53c055099b74920eac66e5f5c4d1?ds=inline

DEBUG_RUNTIME_LIBS depends on BUILD now, not DEBUG_INFO


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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index e1d8ccf6fc..c0bb2db050 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -53,10 +53,15 @@
             Type of compiled binaries
         </description>
     </option>
+    
+    <set var="DEBUG_INFO_DEFAULT">
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
+    </set>
 
     <option name="DEBUG_INFO">
         <values>0,1,default</values>
-        <default-value>default</default-value>
+        <default-value>$(DEBUG_INFO_DEFAULT)</default-value>
         <description>
 Should debugging info be included in the executables? The default value
 "default" means that debug info will be included if BUILD=debug
@@ -79,7 +84,7 @@ be defined if BUILD=debug and not defined if BUILD=release.
             <default-value>default</default-value>
             <description>
 Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
-Acts according to DEBUG_INFO by default.
+Acts according to BUILD by default.
             </description>
         </option>
     </if>
@@ -356,7 +361,7 @@ Set the version of your Mingw installation here.
         <set var="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
-        <set var="DEBUG_INFO">default</set>
+        <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
     </if>