X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/591a3be4262541c8b2cab31b9a5ed3f2ff1c08f3..eb6b14dc71402c42e0474779bfcd6e878383071e:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 1245c000ad..78915bc7a4 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -1,9 +1,8 @@ <?xml version="1.0" ?> -<!-- $Id$ --> <makefile> - <requires version="0.2.1"/> + <requires version="0.2.7"/> <!-- bakefile modules we need: --> <using module="datafiles"/> @@ -22,9 +21,6 @@ <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"/> @@ -33,6 +29,15 @@ <!-- wxWidgets version numbers logic: --> <include file="version.bkl"/> + <set var="ARCH_SUFFIX"> + <if cond="FORMAT=='msevc4prj'">_$(CPU)</if> + <if cond="TARGET_CPU=='amd64'">_x64</if> + <if cond="TARGET_CPU=='AMD64'">_x64</if> + <if cond="TARGET_CPU=='ia64'">_ia64</if> + <if cond="TARGET_CPU=='IA64'">_ia64</if> + <if cond="TARGET_CPU=='x64'">_x64</if> + <if cond="TARGET_CPU=='X64'">_x64</if> + </set> <!-- ================================================================== --> <!-- Names of libraries and DLLs: --> @@ -47,12 +52,26 @@ <if cond="TOOLKIT=='MAC'">_carbon</if> </set> + <!-- + Optional compiler version, mainly for Windows compilers for which it is + supposed to be set on make command line for the official builds. + --> + <set var="COMPILER_VERSION" make_var="1"> + <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if> + </set> + <set var="COMPILERORGCC"> <if cond="isdefined('COMPILER')">$(COMPILER)</if> <if cond="not isdefined('COMPILER')">gcc</if> </set> + + <!-- + In the official builds we use not only the compiler name but also its + version and architecture we compile for in the libraries names. + --> <set var="WXCOMPILER"> - <if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if> + <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if> + <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if> </set> <set var="VENDORTAG"> @@ -60,16 +79,20 @@ <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if> </set> + <!-- debug suffix used for Windows libraries which use debug CRT --> <set var="WXDEBUGFLAG"> - <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if> - <if cond="DEBUG_FLAG=='1'">d</if> + <if cond="BUILD=='debug' and DEBUG_RUNTIME_LIBS=='default'">d</if> + <if cond="DEBUG_RUNTIME_LIBS=='1'">d</if> </set> <set var="WXUNICODEFLAG"> <!-- WinCE is Unicode-only platform: --> <if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if> </set> + <set var="WX_U_D_SUFFIX"> + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + </set> <set var="WXNAMESUFFIX"> - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) </set> <set var="WXUNIVNAME"> @@ -144,13 +167,21 @@ <set var="WXLIB_AUI"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if> </set> + <set var="WXLIB_RIBBON"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('ribbon')))</if> + </set> + <set var="WXLIB_PROPGRID"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if> + </set> <set var="WXLIB_RICHTEXT"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if> </set> <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> @@ -160,28 +191,20 @@ <!-- Where to store built libraries and objects: --> <!-- =============================================================== --> - <set var="DIR_SUFFIX_CPU"> - <if cond="FORMAT=='msevc4prj'">_$(CPU)</if> - <if cond="TARGET_CPU=='amd64'">_amd64</if> - <if cond="TARGET_CPU=='AMD64'">_amd64</if> - <if cond="TARGET_CPU=='ia64'">_ia64</if> - <if cond="TARGET_CPU=='IA64'">_ia64</if> - </set> - <if cond="FORMAT!='autoconf'"> <set var="WXDLLFLAG"> <if cond="SHARED=='1'">dll</if> </set> <set var="CFG_NAME_PART"> - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(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="OBJS" make_var="1"> - $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX) </set> <set var="BUILDDIR">$(OBJS)</set> @@ -197,13 +220,13 @@ <set var="LIBDIRNAME" make_var="1"> <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if> <if cond="FORMAT!='autoconf'"> - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) </if> </set> <if cond="FORMAT!='autoconf'"> <set var="SETUPHDIR" make_var="1"> - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX) </set> </if> @@ -253,9 +276,13 @@ </set> <set var="DEBUG_DEFINE"> - <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if> - <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if> + <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> @@ -263,6 +290,7 @@ </set> <set var="UNICODE_DEFINE"> <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> + <if cond="FORMAT!='autoconf' and UNICODE=='0'">wxUSE_UNICODE=0</if> </set> <set var="MSLU_DEFINE"> <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if> @@ -276,21 +304,23 @@ <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> + <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if> + <if cond="TARGET_CPU=='X64'">/MACHINE:X64</if> </set> <template id="common_settings"> @@ -304,15 +334,15 @@ <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=='msevc4prj' and - BAKEFILE_VERSION in ['0.1.9'] and - USE_RTTI=='0'"> - <!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 --> - <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set> - <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set> - </if> <if cond="FORMAT=='msvc'"> <ldflags>$(LINK_TARGET_CPU)</ldflags> </if> @@ -326,7 +356,7 @@ <template id="3rdparty_lib" template="common_settings,anylib"> <if cond="FORMAT=='autoconf'"> - <libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname> + <libname>$(id)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname> </if> <if cond="FORMAT!='autoconf'"> <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname> @@ -337,15 +367,27 @@ --> <install-if>SHARED=='0'</install-if> <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic> + + <!-- + we don't want to have asserts in the 3rd party libraries code, + 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> <!-- deal with the need to copy setup.h here: --> - <set var="IS_MSVC_PRJ"> - $(FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj']) - </set> - <define-tag name="msvc-headers" rules="dll,lib"> <if cond="IS_MSVC_PRJ"> <msvc-project-files> @@ -355,7 +397,14 @@ </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 @@ -391,10 +440,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h univ/setup.h </msvc-headers-setup-h> <set var="_custom_build_include_wx_msw_setup_h"> - <if cond="WXUNIV=='0'"> + <if cond="WXUNIV=='0' and TOOLKIT=='MSW'"> $(msvc_copy_setup_h_script % 'msw\setup.h') </if> </set> + <set var="_custom_build_include_wx_gtk_setup_h"> + <if cond="WXUNIV=='0' and TOOLKIT=='GTK'"> + $(msvc_copy_setup_h_script % 'gtk\setup.h') + </if> + </set> <set var="_custom_build_include_wx_univ_setup_h"> <if cond="WXUNIV=='1'"> $(msvc_copy_setup_h_script % 'univ\setup.h') @@ -452,7 +506,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r 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"> @@ -460,31 +514,26 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <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> + <!-- GTK+ under Windows requires -mms-bitfields gcc switch --> + <set var="CXXFLAGS_GTK_WINDOWS_GCC"> + <if cond="TOOLKIT=='GTK' and FORMAT=='mingw'">-mms-bitfields</if> + </set> <template id="wx" template="common_settings"> <set var="wxid">$(wxwin.mk_wxid(id))</set> <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> - <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path> - </if> <warnings>max</warnings> <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags> @@ -496,6 +545,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r </cppflags-watcom> <cxxflags-mingw> -Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends --> + $(CXXFLAGS_GTK_WINDOWS_GCC) </cxxflags-mingw> </template> @@ -515,17 +565,11 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r </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> - <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> @@ -552,6 +596,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <sys-lib>rpcrt4</sys-lib> <sys-lib>advapi32</sys-lib> <sys-lib>wsock32</sys-lib> + <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't + know if it is here so just add it unconditionally --> + <sys-lib>wininet</sys-lib> </if> <if cond="FORMAT=='borland'"> <sys-lib>oleacc</sys-lib> @@ -559,23 +606,38 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r </if> </template> + <set var="LIB_GTK"> + <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if> + </set> <!-- for GUI libs/samples: --> <template id="wx_append_nomono" template_append="wx_append_base_nomono"> <sys-lib>$(LIB_TIFF)</sys-lib> <sys-lib>$(LIB_JPEG)</sys-lib> <sys-lib>$(LIB_PNG)</sys-lib> + <ldlibs>$(LIB_GTK)</ldlibs> <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs> </template> + <set var="LIB_PNG_IF_MONO"> + <if cond="MONOLITHIC=='1'">$(LIB_PNG)</if> + </set> + + <set var="LIB_SCINTILLA_IF_MONO"> + <if cond="MONOLITHIC=='1' and USE_STC=='1'">$(LIB_SCINTILLA)</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: --> <sys-lib>$(WXLIB_MONO)</sys-lib> + <sys-lib>$(LIB_SCINTILLA_IF_MONO)</sys-lib> </template> @@ -588,7 +650,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <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'"> <sources>$(WXTOPDIR)src/common/dummy.cpp</sources> <precomp-headers-gen> $(WXTOPDIR)src/common/dummy.cpp @@ -600,16 +662,20 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <precomp-headers-file>wxprec_$(id)</precomp-headers-file> <precomp-headers-exclude> src/common/extended.c + src/gtk/eggtrayicon.c + src/gtk/treeentry_gtk.c </precomp-headers-exclude> </if> <if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'"> <msvc-file-group>Common Sources:src/common/*</msvc-file-group> + <msvc-file-group>GTK+ Sources:src/gtk/*</msvc-file-group> <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group> <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group> <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group> <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group> <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group> + <msvc-file-group>GTK+ Headers:*wx/gtk/*.h</msvc-file-group> <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group> <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group> <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group> @@ -640,8 +706,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <if cond="FORMAT=='autoconf'"> <res-include>$(RCDEFDIR)</res-include> <res-include>$(TOP_SRCDIR)include</res-include> + <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command> </if> <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res> + </template> <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'"> @@ -659,9 +727,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r </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> @@ -713,13 +778,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r </set> <set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set> - <set var="PLUGINSUFFIX"> - <if cond="UNICODE=='0' and BUILD=='release'"></if> - <if cond="UNICODE=='0' and BUILD=='debug'">d</if> - <if cond="UNICODE=='1' and BUILD=='release'">u</if> - <if cond="UNICODE=='1' and BUILD=='debug'">ud</if> - </set> - <set var="PLUGINS_INST_DIR" make_var="1"> $(LIBDIR)/wx/$(PLUGIN_VERSION0) </set> @@ -727,7 +785,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <define-rule name="wx-base-plugin" extends="module"> <template> <dllname> - $(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER) + $(id)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER) </dllname> <define>WXUSINGDLL</define> <define>wxUSE_GUI=0</define> @@ -738,7 +796,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r <define-rule name="wx-gui-plugin" extends="module"> <template template="wx"> <dllname> - $(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER) + $(id)_$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER) </dllname> <define>WXUSINGDLL</define> <install-to>$(PLUGINS_INST_DIR)</install-to>