Register multibutton editor class in frame ctor instead of CreateGrid() (this fixes...

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 8c6f6eecc68270185a1feda51745a8e83734bed4..37ed41dc6d443c4fac3bc3f132c163b4aa0e5aac 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -107,14 +107,10 @@ Accepted values: AMD64, IA64.
         <set var="TARGET_CPU"/>
     </if>
 
         <set var="TARGET_CPU"/>
     </if>
 

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

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

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

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


@@ -217,6 +213,14 @@ Acts according to BUILD by default.
         </description>
     </option>
 
         </description>
     </option>
 

+    <option name="USE_PROPGRID">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxPropertyGrid library (USE_GUI must be 1)?
+        </description>
+    </option>
+

     <option name="USE_RICHTEXT">
         <values>0,1</values>
         <default-value>1</default-value>
     <option name="USE_RICHTEXT">
         <values>0,1</values>
         <default-value>1</default-value>


@@ -392,7 +396,9 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
 
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>

-            <if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
+            <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003'">WINCE</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="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>


@@ -415,10 +421,9 @@ it if SHARED=1 unless you know what you are doing.
 
         <set var="WITH_PLUGIN_SDL">0</set>
 
 
         <set var="WITH_PLUGIN_SDL">0</set>
 

-        <set var="SRCDIR">
-            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
-            <if cond="BUILDING_LIB=='0'">.</if>
-        </set>
+        <if cond="BUILDING_LIB=='1'">
+            <set-srcdir>../..</set-srcdir>
+        </if>

         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 


@@ -447,6 +452,7 @@ Set the version of your Mingw installation here.
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>

+        <set var="USE_PROPGRID">1</set>

         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>
         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>


@@ -480,14 +486,17 @@ 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'">
+    <if cond="FORMAT=='msevc4prj' or (FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003')">

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

+        <set var="USE_OPENGL">0</set> <!-- need OpenGL ES support first -->

         <!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
         <!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->

-        <set var="USE_RTTI">0</set>
-        <set var="USE_EXCEPTIONS">0</set>
+        <if cond="FORMAT=='msevc4prj'">
+            <set var="USE_RTTI">0</set>
+            <set var="USE_EXCEPTIONS">0</set>
+        </if>

     </if>
 
     <!-- Need for wxUniv within wxMGL: -->
     </if>
 
     <!-- Need for wxUniv within wxMGL: -->