Change wxBoxSizer::AddSpacer() to only add space in sizer direction.

[wxWidgets.git] / build / bakefiles / config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 37ed41dc6d443c4fac3bc3f132c163b4aa0e5aac..8ec1dbaa728c90617197f6f7403327fcffe41850 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -4,8 +4,12 @@
 <makefile>
 
     <set var="IS_MSVC_PRJ">
 <makefile>
 
     <set var="IS_MSVC_PRJ">

-        $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj'])
+        $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'])

     </set>
     </set>

+    <set var="IS_MSVC">
+        $(IS_MSVC_PRJ=='1' or FORMAT=='msvc')
+    </set>
+

 
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
 
     <set var="BUILDING_LIB" overwrite="0">0</set>
 


@@ -107,9 +111,15 @@ Accepted values: AMD64, IA64.
         <set var="TARGET_CPU"/>
     </if>
 
         <set var="TARGET_CPU"/>
     </if>
 

+    <!--
+        For MSVC enable debug information in all builds: it is needed to be
+        able to debug the crash dumps produced by wxDebugReport and as it
+        generates it in separate PDB files it doesn't cost us much to enable it
+        (except for disk space...).
+     -->

     <set var="DEBUG_INFO_DEFAULT">
     <set var="DEBUG_INFO_DEFAULT">

-        <if cond="IS_MSVC_PRJ=='1'">1</if>
-        <if cond="IS_MSVC_PRJ=='0'">default</if>
+        <if cond="IS_MSVC=='1'">1</if>
+        <if cond="IS_MSVC=='0'">default</if>

     </set>
 
     <option name="DEBUG_INFO">
     </set>
 
     <option name="DEBUG_INFO">


@@ -124,10 +134,11 @@ and not included if BUILD=release.
 
     <option name="DEBUG_FLAG">
         <values>0,1,default</values>
 
     <option name="DEBUG_FLAG">
         <values>0,1,default</values>

-        <default-value>default</default-value>
+        <default-value>1</default-value>

         <description>
         <description>

-Should __WXDEBUG__ be defined? The default value "default" means that it will
-be defined if BUILD=debug and not defined if BUILD=release.
+Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+but expensive assert checks are enabled, use 0 to completely remove debugging
+code.

         </description>
     </option>
 
         </description>
     </option>
 


@@ -136,8 +147,8 @@ be defined if BUILD=debug and not defined if BUILD=release.
             <values>0,1,default</values>
             <default-value>default</default-value>
             <description>
             <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 BUILD by default.
+Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?
+Default is to use debug CRT if and only if BUILD==debug.

             </description>
         </option>
     </if>
             </description>
         </option>
     </if>


@@ -239,7 +250,7 @@ Acts according to BUILD by default.
 
     <option name="USE_OPENGL">
         <values>0,1</values>
 
     <option name="USE_OPENGL">
         <values>0,1</values>

-        <default-value>0</default-value>
+        <default-value>1</default-value>

         <description>
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>
         <description>
             Build OpenGL canvas library (USE_GUI must be 1)?
         </description>


@@ -247,8 +258,8 @@ Acts according to BUILD by default.
 
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">
 
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">

-        <if cond="FORMAT in ['msvc','msvc6prj','msvs2003prj','msvs2005prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj']">0</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">0</if>

     </set>
     <option name="USE_QA">
         <values>0,1</values>
     </set>
     <option name="USE_QA">
         <values>0,1</values>


@@ -289,7 +300,7 @@ Acts according to BUILD by default.
             <description>
                 Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
             </description>
             <description>
                 Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
             </description>

-       </option>
+        </option>

     </if>
 
     <option name="OFFICIAL_BUILD">
     </if>
 
     <option name="OFFICIAL_BUILD">


@@ -362,8 +373,12 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS_GNOMEPRINT"/>
         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
         <option name="EXTRALIBS_GNOMEPRINT"/>
         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>

+        <option name="DYLIB_RPATH_INSTALL"/>
+        <option name="DYLIB_RPATH_POSTLINK"/>

         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_FLAG"/>

-        <option name="SAMPLES_RPATH_POSTLINK"/>
+
+        <!-- see configure.in; it's required by some samples on Mac OS X -->
+        <option name="HEADER_PAD_OPTION"/>

 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>


@@ -397,8 +412,10 @@ it if SHARED=1 unless you know what you are doing.
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>

+            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</if>

             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>

-            <if cond="FORMAT not in ['msevc4prj','msvs2005prj'] and PLATFORM_WIN32=='1'">MSW</if>
+            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
+            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>

             <if cond="PLATFORM_MSDOS=='1'">MGL</if>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
             <if cond="PLATFORM_MSDOS=='1'">MGL</if>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>


@@ -486,7 +503,7 @@ Set the version of your Mingw installation here.
     </if>
 
     <!-- No need for wxUniv on embedded devices (yet): -->
     </if>
 
     <!-- No need for wxUniv on embedded devices (yet): -->

-    <if cond="FORMAT=='msevc4prj' or (FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003')">
+    <if cond="FORMAT=='msevc4prj' or (FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003') or (FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003')">

         <set var="WXUNIV">0</set>
         <!-- Uploading debug reports from PDAs seems impractical -->
         <set var="USE_QA">0</set>
         <set var="WXUNIV">0</set>
         <!-- Uploading debug reports from PDAs seems impractical -->
         <set var="USE_QA">0</set>