<makefile>
+ <set var="IS_MSVC_PRJ">
+ $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'])
+ </set>
+ <set var="IS_MSVC">
+ $(IS_MSVC_PRJ=='1' or FORMAT=='msvc')
+ </set>
+
+
<set var="BUILDING_LIB" overwrite="0">0</set>
<set var="CPP_DEFAULT_VALUE">
</description>
</option>
- <option name="UNICODE">
- <values>0,1</values>
- <values-description>,Unicode</values-description>
- <default-value>1</default-value>
- <description>
- Compile Unicode build of wxWidgets?
- </description>
- </option>
+ <!-- don't include ANSI configuration in project files, it's going to be
+ eventually removed anyway and it only doubles the number of build
+ configs in projects: -->
+ <if cond="IS_MSVC_PRJ=='1'">
+ <set var="UNICODE">1</set>
+ </if>
+ <if cond="IS_MSVC_PRJ=='0'">
+ <option name="UNICODE">
+ <values>0,1</values>
+ <values-description>,Unicode</values-description>
+ <default-value>1</default-value>
+ <description>
+ Compile Unicode build of wxWidgets?
+ </description>
+ </option>
+ </if>
<if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
<option name="MSLU">
<set var="TARGET_CPU"/>
</if>
- <!-- FIXME: restore this once bakefile is fixed to not use
- /Gm /GZ (incompatible with /O2) w/ debug-info -->
+ <!--
+ For MSVC enable debug information in all builds: it is needed to be
+ able to debug the crash dumps produced by wxDebugReport and as it
+ generates it in separate PDB files it doesn't cost us much to enable it
+ (except for disk space...).
+ -->
<set var="DEBUG_INFO_DEFAULT">
- <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
- <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
+ <if cond="IS_MSVC=='1'">1</if>
+ <if cond="IS_MSVC=='0'">default</if>
</set>
- -->
- <set var="DEBUG_INFO_DEFAULT">default</set>
<option name="DEBUG_INFO">
<values>0,1,default</values>
<option name="DEBUG_FLAG">
<values>0,1,default</values>
- <default-value>default</default-value>
+ <default-value>1</default-value>
<description>
-Should __WXDEBUG__ be defined? The default value "default" means that it will
-be defined if BUILD=debug and not defined if BUILD=release.
+Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+but expensive assert checks are enabled, use 0 to completely remove debugging
+code.
</description>
</option>
<values>0,1,default</values>
<default-value>default</default-value>
<description>
-Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
-Acts according to BUILD by default.
+Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?
+Default is to use debug CRT if and only if BUILD==debug.
</description>
</option>
</if>
</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>
+ <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_OPENGL">
<values>0,1</values>
- <default-value>0</default-value>
+ <default-value>1</default-value>
<description>
Build OpenGL canvas library (USE_GUI must be 1)?
</description>
</option>
- <option name="USE_ODBC">
- <values>0,1</values>
- <default-value>0</default-value>
- <description>
- Build ODBC database classes (USE_GUI must be 1)?
- </description>
- </option>
-
<!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
<set var="USE_QA_DEFAULT">
- <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
- <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
+ <if cond="FORMAT in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">1</if>
+ <if cond="FORMAT not in ['msvc','msvc6prj','msvs2003prj','msvs2005prj','msvs2008prj']">0</if>
</set>
<option name="USE_QA">
<values>0,1</values>
</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="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
- <option name="EXTRALIBS_ODBC"/>
+ <option name="EXTRALIBS_MEDIA"/>
<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="DYLIB_RPATH_POSTLINK"/>
<option name="SAMPLES_RPATH_FLAG"/>
- <option name="SAMPLES_RPATH_POSTLINK"/>
+
+ <!-- see configure.in; it's required by some samples on Mac OS X -->
+ <option name="HEADER_PAD_OPTION"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<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=='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="PLATFORM_OS2=='1'">PM</if>
</set>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
- <set var="EXTRALIBS_ODBC"/>
+ <set var="EXTRALIBS_MEDIA"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
<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="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_MEDIA">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>
- <set var="USE_ODBC">1</set>
<set var="USE_QA">1</set>
<set var="MONOLITHIC">0</set>
<set var="USE_GUI">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>
</if>
<!-- No need for wxUniv on embedded devices (yet): -->
- <if cond="FORMAT=='msevc4prj'">
+ <if cond="FORMAT=='msevc4prj' or (FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='pocketpc2003') or (FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='pocketpc2003')">
<set var="WXUNIV">0</set>
- <set var="UNICODE">1</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 -->
- <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: -->
projects / wxWidgets.git / blobdiff