fixes potential crash under gatekeeper

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 8ec1dbaa728c90617197f6f7403327fcffe41850..278c11cdf15c567ed4043add3f89d16f3af5696f 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -45,14 +45,52 @@
         </description>
     </option>
 
         </description>
     </option>
 

-    <option name="WXUNIV">
-        <values>0,1</values>
-        <values-description>,Universal</values-description>
-        <default-value>0</default-value>
-        <description>
-            Build wxUniversal instead of native port?
-        </description>
-    </option>
+    <if cond="FORMAT!='autoconf'">
+        <option name="TOOLKIT">
+            <values>MSW,GTK</values>
+            <values-description>,GTK+</values-description>
+            <default-value>MSW</default-value>
+            <description>
+                Used toolkit
+            </description>
+        </option>
+
+        <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+            <option name="TOOLKIT_VERSION">
+                <values>,2</values>
+                <values-description>,2</values-description>
+                <default-value></default-value>
+                <description>
+                    GTK+ toolkit version
+                </description>
+            </option>
+        </if>
+
+        <if cond="FORMAT in ['msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
+            <set var="TOOLKIT">MSW</set>
+        </if>
+    </if>
+
+    <!--
+        Don't include wxUniversal configurations in project files, they
+        confuse people who don't know what "Universal" means and double the
+        number of configurations. If you do need to build wxUniversal, either
+        use the make files or comment out the 3 lines below and rerun
+        bakefile_gen to regenerate the projects with them.
+     -->
+    <if cond="IS_MSVC_PRJ=='1'">
+        <set var="WXUNIV">0</set>
+    </if>
+    <if cond="IS_MSVC_PRJ=='0'">
+        <option name="WXUNIV">
+            <values>0,1</values>
+            <values-description>,Universal</values-description>
+            <default-value>0</default-value>
+            <description>
+                Build wxUniversal instead of native port?
+            </description>
+        </option>
+    </if>

 
     <!-- don't include ANSI configuration in project files, it's going to be
          eventually removed anyway and it only doubles the number of build
 
     <!-- don't include ANSI configuration in project files, it's going to be
          eventually removed anyway and it only doubles the number of build


@@ -103,7 +141,8 @@ your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
 
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
 

-Accepted values: AMD64, IA64.
+Accepted values: IA64, X64
+(AMD64 accepted as synonym for X64 but should not be used any more).

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


@@ -200,6 +239,14 @@ Default is to use debug CRT if and only if BUILD==debug.
         </description>
     </option>
 
         </description>
     </option>
 

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

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


@@ -224,6 +271,14 @@ Default is to use debug CRT if and only if BUILD==debug.
         </description>
     </option>
 
         </description>
     </option>
 

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

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


@@ -293,15 +348,13 @@ Default is to use debug CRT if and only if BUILD==debug.
         </description>
     </option>
 
         </description>
     </option>
 

-    <if cond="FORMAT!='autoconf'">
-        <option name="USE_GDIPLUS">
-            <values>0,1</values>
-            <default-value>0</default-value>
-            <description>
-                Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
-            </description>
-        </option>
-    </if>
+    <option name="USE_CAIRO">
+        <values>0,1</values>
+        <default-value>0</default-value>
+        <description>
+            Enable wxCairoContext for platforms other than Linux/GTK.
+        </description>
+    </option>

 
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
 
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>


@@ -370,7 +423,6 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>

-        <option name="EXTRALIBS_GNOMEPRINT"/>

         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
         <option name="DYLIB_RPATH_INSTALL"/>
         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
         <option name="DYLIB_RPATH_INSTALL"/>


@@ -382,7 +434,7 @@ to run the tests, include CppUnit library here.
 
         <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>

-        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+        <set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->

 
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
 
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>


@@ -407,20 +459,40 @@ it if SHARED=1 unless you know what you are doing.
             </description>
         </option>
 
             </description>
         </option>
 

-        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+        <set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
+
+        <set var="WIN32_TOOLKIT">
+            <if cond="TOOLKIT=='MSW'">MSW</if>
+            <if cond="TOOLKIT=='GTK'">GTK</if>
+        </set>
+        <set var="WIN32_TOOLKIT_LOWERCASE">
+            <if cond="TOOLKIT=='MSW'">msw</if>
+            <if cond="TOOLKIT=='GTK'">gtk</if>
+        </set>

 
         <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>
 
         <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=='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="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
+            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT)</if>
+            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT)</if>

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

-        <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
-        <set var="TOOLKIT_VERSION"/>
+        <set var="TOOLKIT_LOWERCASE">
+            <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'">$(WIN32_TOOLKIT_LOWERCASE)</if>
+            <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">$(WIN32_TOOLKIT_LOWERCASE)</if>
+            <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">$(WIN32_TOOLKIT_LOWERCASE)</if>
+            <if cond="PLATFORM_OS2=='1'">pm</if>
+        </set>
+        <if cond="FORMAT in ['msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+            <set var="TOOLKIT_VERSION">
+                <if cond="PLATFORM_WIN32=='1' and TOOLKIT=='GTK'">2</if>
+            </set>
+        </if>

         <set var="HOST_SUFFIX"/>
         <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>
         <set var="HOST_SUFFIX"/>
         <set var="EXTRACFLAGS"/>
         <set var="EXTRALIBS"/>


@@ -469,10 +541,12 @@ 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_RIBBON">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_PROPGRID">1</set>
         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>

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

         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>


@@ -482,7 +556,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="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>

-        <if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
+        <set var="USE_CAIRO">0</set>

         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>


@@ -516,11 +590,4 @@ Set the version of your Mingw installation here.
         </if>
     </if>
 
         </if>
     </if>
 

-    <!-- Need for wxUniv within wxMGL: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
-        <set var="WXUNIV">1</set>
-        <set var="USE_THREADS">0</set>
-        <set var="RUNTIME_LIBS">static</set>
-    </if>
-

 </makefile>
 </makefile>