Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index c0bb2db05005bfea8421d223b095c3635014554d..1c2cbfad9ac7bde2a70464ffb0b6b7e2d256e761 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -53,11 +53,15 @@
             Type of compiled binaries
         </description>
     </option>
             Type of compiled binaries
         </description>
     </option>

-    
+
+    <!-- FIXME: restore this once bakefile is fixed to not use
+                /Gm /GZ (incompatible with /O2) w/ debug-info -->

     <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>
     <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>

+    -->
+    <set var="DEBUG_INFO_DEFAULT">default</set>

 
     <option name="DEBUG_INFO">
         <values>0,1,default</values>
 
     <option name="DEBUG_INFO">
         <values>0,1,default</values>


@@ -275,7 +279,7 @@ to run the tests, include CppUnit library here.
 
 
     <!-- ================================================================== -->
 
 
     <!-- ================================================================== -->

-    <!--                         windows compilers                          -->
+    <!--                     windows/dos/os2 compilers                      -->

     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">


@@ -292,8 +296,10 @@ it if SHARED=1 unless you know what you are doing.
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
         <set var="TOOLKIT" overwrite="0">
         <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
 
         <set var="TOOLKIT" overwrite="0">

-            <if cond="FORMAT!='msevc4prj'">MSW</if>

             <if cond="FORMAT=='msevc4prj'">WINCE</if>
             <if cond="FORMAT=='msevc4prj'">WINCE</if>

+            <if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
+            <if cond="PLATFORM_MSDOS=='1'">DOS</if>
+            <if cond="PLATFORM_OS2=='1'">PM</if>

         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>


@@ -397,7 +403,7 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>
     <if cond="FORMAT=='msevc4prj'">
         <set var="WXUNIV">0</set>
         <set var="UNICODE">1</set>

-       <!-- Uploading debug reports from PDAs seems impractical -->
+        <!-- Uploading debug reports from PDAs seems impractical -->

         <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
     </if>
         <set var="USE_QA">0</set>
         <set var="MONOLITHIC">1</set> <!-- sic! -->
     </if>