added DEBUG_FLAG, DEBUG_INFO and DEBUG_RUNTIME_LIBS options

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

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 38c285caa3234081af6367c5eb4a2c8301177eca..f3bea2a62ad59d46edbdbf6674c09901d4d0afba 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -8,7 +8,9 @@ CDEPS = config.bkl common.bkl common_contrib.bkl
 SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
 
-DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1            -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1
+DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
+           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1 \
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default
 AUTOCONF_ALL = \
        ../../Makefile.in \
        ../../contrib/samples/animate/Makefile.in \

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 896ee5e0469357d3230896ce3df2f2ccc8236f04..0ef7e41c41ae951b3f45d8d2ab91b41bd624ebd7 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -61,7 +61,8 @@
     </set>
 
     <set var="WXDEBUGFLAG">
-        <if cond="BUILD=='debug'">d</if>
+        <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
+        <if cond="DEBUG_FLAG=='1'">d</if>
     </set>
     <set var="WXUNICODEFLAG">
         <if cond="UNICODE=='1'">u</if>
@@ -161,9 +162,16 @@
     <!--                        Templates for libs:                      -->
     <!-- =============================================================== -->
 
-    <set var="DEBUGFLAG">
-        <if cond="BUILD=='debug'">on</if>
-        <if cond="BUILD=='release'">off</if>
+    <set var="DEBUGINFO">
+        <if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
+        <if cond="DEBUG_INFO=='1'">on</if>
+        <if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
+        <if cond="DEBUG_INFO=='0'">off</if>
+    </set>
+    <set var="DEBUGRUNTIME">
+        <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
+        <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
     </set>
     <set var="OPTIMIZEFLAG">
         <if cond="BUILD=='debug'">off</if>
@@ -171,14 +179,16 @@
     </set>
 
     <set var="DEBUG_DEFINE">
-        <if cond="FORMAT!='autoconf' and BUILD=='debug'">__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>
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if>
     </set>
 
     <template id="common_settings">
-        <debug-info>$(DEBUGFLAG)</debug-info>
+        <debug-info>$(DEBUGINFO)</debug-info>
+        <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 65d75183e2e7d409ffac077636ede22920b848b0..d899bbcc17b02f6ea1366ee0a781f4b0b36af946 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -5,6 +5,47 @@
     
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
+    <option name="BUILD">
+        <values>debug release</values>
+        <values-description>Debug Release</values-description>
+        <default-value>release</default-value>
+        <description>
+            Type of compiled binaries
+        </description>
+    </option>
+    
+    <option name="DEBUG_INFO">
+        <values>0 1 default</values>
+        <default-value>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
+and not included if BUILD=release.
+        </description>
+    </option>
+    
+    <option name="DEBUG_FLAG">
+        <values>0 1 default</values>
+        <default-value>default</default-value>
+        <description>
+Should __WXDEBUG__ be defined? The default value "default" means that it will
+be defined if BUILD=debug and not defined if BUILD=release.
+        </description>
+    </option>
+
+    <if cond="FORMAT=='msvc'">
+        <option name="DEBUG_RUNTIME_LIBS">
+            <values>0 1 default</values>
+            <default-value>default</default-value>
+            <description>
+Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
+Acts according to DEBUG_INFO by default.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT!='msvc'">
+        <set var="DEBUG_RUNTIME_LIBS">default</set>
+    </if>
 
     <option name="UNICODE">
         <values>0 1</values>
@@ -84,9 +125,9 @@
     <option name="CFG">
         <default-value></default-value>
         <description>
-            Name of your custom configuration. This affects directory
-            where object files are stored as well as the location of
-            compiled .lib files and setup.h under the lib/ toplevel directory.
+Name of your custom configuration. This affects directory
+where object files are stored as well as the location of
+compiled .lib files and setup.h under the lib/ toplevel directory.
         </description>
     </option>
 
@@ -122,9 +163,9 @@
             <values>dynamic static</values>
             <default-value>dynamic</default-value>
             <description>
-                Version of C runtime library to use. You can change this to
-                static if SHARED=0, but it is highly recommended to not do
-                it if SHARED=1 unless you know what you are doing.
+Version of C runtime library to use. You can change this to
+static if SHARED=0, but it is highly recommended to not do
+it if SHARED=1 unless you know what you are doing.
             </description>
         </option>
         
@@ -152,9 +193,9 @@
             <values>3 2.95</values>
             <default-value>3</default-value>
             <description>
-                Set the version of your Mingw installation here.
-                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
-                "2.95" ... for Mingw 1.1 or any of the older versions
+Set the version of your Mingw installation here.
+    "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
+    "2.95" ... for Mingw 1.1 or any of the older versions
             </description>
         </option>
         <set var="GCCFLAGS">

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 732a492aa06c4c33700a994307218b0cc51bd89a..93af8c706aa9361c3d7ae55739401a8990c576ef 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -20,8 +20,9 @@ CDEPS = config.bkl common.bkl common_contrib.bkl
 SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
 
-DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
-           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1
+DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
+           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default
 """)
 
 lines = {}