<set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
-
+ <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>
</set>
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
</set>
- <!-- NB: this is make_var so that it can be overriden on command line
+ <!-- NB: this is make_var so that it can be overridden on command line
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="DEBUG_DEFINE">
<if cond="DEBUG_FLAG=='0'">wxDEBUG_LEVEL=0</if>
</set>
+ <set var="NDEBUG_DEFINE">
+ <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">NDEBUG</if>
+ <if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='0'">NDEBUG</if>
+ </set>
+
<!-- does not cover all cases, but better than nothing -->
<set var="NO_VC_CRTDBG">
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
-
- <if cond="FORMAT!='autoconf'">
- <set var="GDIPLUS_LIB">
- <if cond="USE_GDIPLUS=='1'">gdiplus</if>
- </set>
- <set var="GFXCTX_DEFINE">
- <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
- </set>
- </if>
+ <set var="CAIRO_LIB">
+ <if cond="USE_CAIRO=='1'">cairo</if>
+ </set>
+ <set var="CAIRO_LIBDIR">
+ <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/lib</if>
+ </set>
+ <set var="CAIRO_INCLUDEDIR">
+ <if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
+ </set>
<set var="LINK_TARGET_CPU">
- <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
- <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
+ <if cond="TARGET_CPU=='amd64'">/MACHINE:X64</if>
+ <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
+ <!-- Suppress deprecation warnings for standard library calls -->
+ <if cond="FORMAT in ['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'">
neither we nor wx users are interested in debugging them anyhow
-->
<define>NDEBUG</define>
+
+ <if cond="IS_MSVC">
+ <!--
+ we're not interested in deprecation warnings about the use of
+ standard C functions in the 3rd party libraries (these warnings
+ are only given by VC8+ but it's simpler to just always define
+ this symbol which disables them, even for previous VC versions)
+ -->
+ <define>_CRT_SECURE_NO_WARNINGS</define>
+ </if>
</template>
</define-tag>
<set var="msvc_copy_setup_h_script">
- <if cond="IS_MSVC_PRJ">
+ <if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']">
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\..\include\wx\%s
+
+"$(SETUPHDIR)\wx\setup.h" :
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+ </if>
+ <if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
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">
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
+ <define>$(NDEBUG_DEFINE)</define>
<define>$(EXCEPTIONS_DEFINE)</define>
<define>$(RTTI_DEFINE)</define>
<define>$(THREAD_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<define>$(MSLU_DEFINE)</define>
- <if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<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>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
- <sys-lib>$(GDIPLUS_LIB)</sys-lib>
+ <sys-lib>$(CAIRO_LIB)</sys-lib>
+ <lib-path>$(CAIRO_LIBDIR)</lib-path>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
+ <set var="LIB_PNG_IF_MONO">
+ <if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
+ </set>
<template id="wx_append_base" template_append="wx_append_base_nomono">
- <!-- Always link against the wxWin library in monolithic build: -->
+ <!-- Always link against the full wx library in monolithic build and
+ also against the PNG one as core code references it for Tango
+ icons and so it is pulled in even by the console programs. -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
+ <sys-lib>$(LIB_PNG_IF_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
projects / wxWidgets.git / blobdiff