<set var="PLATFORM_MACOS">0</set>
</if>
- <!-- FIXME: PalmOS is another candidate to bakefiles -->
- <set var="PLATFORM_PALMOS">0</set>
-
-
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
- <set var="WXLIB_WEB">
- <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('web')))</if>
+ <set var="WXLIB_WEBVIEW">
+ <if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
+ <!-- Suppress deprecation warnings for standard library calls -->
+ <if cond="FORMAT in ['msvc','msvs2005prj','msvs2008prj']">
+ <define>_CRT_SECURE_NO_DEPRECATE=1</define>
+ <define>_CRT_NON_CONFORMING_SWPRINTFS=1</define>
+ <define>_SCL_SECURE_NO_WARNINGS=1</define>
+ </if>
+
<define>$(NO_VC_CRTDBG)</define>
<define>$(WIN32_WINNT)</define>
<if cond="FORMAT=='msvc'">
The variables below are defined so that all libs are used
in monolithic build, but not in multilib one. -->
<set var="EXTRALIBS_FOR_BASE">
- <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
+ <if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_XML) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
</set>
<set var="EXTRALIBS_FOR_GUI">
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
- <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
- <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
- <set var="MGLPMLIBPATH">
- <if cond="DOS32=='DOS4GW'">dos4gw</if>
- </set>
- </if>
-
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
<lib-path>$(LIBDIRNAME)</lib-path>
- <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
- <lib-path>$(MGLLIBPATH)</lib-path>
- <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
- </if>
<warnings>max</warnings>
<cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
</if>
</if>
- <!-- system libraries on mgl: -->
- <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
- <sys-lib>mgl</sys-lib>
- <sys-lib>mglcpp</sys-lib>
- <sys-lib>pm</sys-lib>
- </if>
-
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<define>WXBUILDING</define>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+ <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/common/dummy.cpp
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
- <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
- <include>$(DOLLAR)(%SCITECH)/include</include>
- </if>
<include>$(INC_TIFF_BUILD)</include>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>