X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9b55ad51603637f131e73a8a2fe19fd720ace75..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index e1748c9ac6..278c11cdf1 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -45,14 +45,52 @@
         </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
@@ -208,7 +246,7 @@ Default is to use debug CRT if and only if BUILD==debug.
             Build wxWebView library (USE_GUI must be 1)?
         </description>
     </option>
-    
+
     <option name="USE_MEDIA">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -423,17 +461,38 @@ it if SHARED=1 unless you know what you are doing.
 
         <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>
-            <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="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>
-        <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"/>