</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
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>
+ <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="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"/>
<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="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>
- <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="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>
</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>