Support IRIX version of OpenGL multi sampling constants.

[wxWidgets.git] / build / bakefiles / common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index d1f73b67fa8ce1998fb25040784e029f0afe7ae2..38c6d80e9b10076ea79af497d80eb06276c146ea 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
 
 
 <makefile>
 

-    <requires version="0.1.7"/>
+    <requires version="0.2.7"/>

 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
 
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>


@@ -25,6 +25,7 @@
     <!-- FIXME: PalmOS is another candidate to bakefiles -->
     <set var="PLATFORM_PALMOS">0</set>
 
     <!-- FIXME: PalmOS is another candidate to bakefiles -->
     <set var="PLATFORM_PALMOS">0</set>
 

+

     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>
     <include file="config.bkl"/>
 
     <include file="plugins_deps.bkl"/>


@@ -60,16 +61,20 @@
         <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
     </set>
 
         <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">
     <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>
     <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">
     <set var="WXNAMESUFFIX">

-        $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+        $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR)

     </set>
 
     <set var="WXUNIVNAME">
     </set>
 
     <set var="WXUNIVNAME">


@@ -130,7 +135,7 @@
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
     <set var="WXLIB_MEDIA">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
     </set>
     <set var="WXLIB_MEDIA">

-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
+        <if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>

     </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
     </set>
     <set var="WXLIB_HTML">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>


@@ -141,13 +146,20 @@
     <set var="WXLIB_XRC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
     </set>
     <set var="WXLIB_XRC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
     </set>

-    <set var="WXLIB_ODBC">
-        <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
-            $(mk.evalExpr(wxwin.mkLibName('odbc')))
-        </if>
+    <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>

-    <set var="WXLIB_DBGRID">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
+    <set var="WXLIB_STC">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>

     </set>
 
     <set var="WXLIB_MONO">
     </set>
 
     <set var="WXLIB_MONO">


@@ -172,15 +184,15 @@
             <if cond="SHARED=='1'">dll</if>
         </set>
         <set var="CFG_NAME_PART">
             <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>
         </set>

+
+        <!-- NB: this is make_var so that it can be overriden 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">
         <set var="OBJS" make_var="1">

-            <if cond="FORMAT!='cbuilderx'">
-                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
-            </if>
-            <!-- FIXME: waiting for removal after CBX has better ../ dirs
-                 support -->
-            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
+            $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)

         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>


@@ -194,15 +206,15 @@
     </set>
 
     <set var="LIBDIRNAME" make_var="1">
     </set>
 
     <set var="LIBDIRNAME" make_var="1">

-        <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
+        <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>

         <if cond="FORMAT!='autoconf'">
         <if cond="FORMAT!='autoconf'">

-            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+            $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)

         </if>
     </set>
 
     <if cond="FORMAT!='autoconf'">
         <set var="SETUPHDIR" make_var="1">
         </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>
 
         </set>
     </if>
 


@@ -252,9 +264,13 @@
     </set>
 
     <set var="DEBUG_DEFINE">
     </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>

+    <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>
     <!-- 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>


@@ -262,6 +278,7 @@
     </set>
     <set var="UNICODE_DEFINE">
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
     </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>
     </set>
     <set var="MSLU_DEFINE">
         <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>


@@ -275,10 +292,27 @@
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>
     <set var="UNICOWS_LIB">
         <if cond="MSLU=='1'">unicows</if>
     </set>

+    <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>
+    <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="LINK_TARGET_CPU">
 
     <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="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
     </set>


@@ -296,16 +330,10 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</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>
         <if cond="FORMAT=='msvc'">
             <ldflags>$(LINK_TARGET_CPU)</ldflags>
         </if>

+        <include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include>

     </template>
 
     <template id="anylib">
     </template>
 
     <template id="anylib">


@@ -315,7 +343,7 @@
 
     <template id="3rdparty_lib" template="common_settings,anylib">
         <if cond="FORMAT=='autoconf'">
 
     <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>
         </if>
         <if cond="FORMAT!='autoconf'">
             <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>


@@ -326,33 +354,39 @@
         -->
         <install-if>SHARED=='0'</install-if>
         <pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
         -->
         <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: -->
 
     </template>
 
 
     <!-- deal with the need to copy setup.h here: -->
 

-    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
-

     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">

-            <!-- FIXME: remove this once we require >=bkl-0.1.9 -->
-            <if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
-            <if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
-                <msvc-project-files>
-                    $(addPrefixToList('include\\', wxwin.headersOnly(value)))
-                </msvc-project-files>
-            </if>
+            <msvc-project-files>
+                $(addPrefixToList('include\\', wxwin.headersOnly(value)))
+            </msvc-project-files>

         </if>
     </define-tag>
 
     <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
 Creating $(SETUPHDIR)\wx\setup.h
         </if>
     </define-tag>
 
     <set var="msvc_copy_setup_h_script">
         <if cond="IS_MSVC_PRJ">
 Creating $(SETUPHDIR)\wx\setup.h

-InputPath=..\include\wx\%s
+InputPath=..\..\include\wx\%s

 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h


@@ -411,8 +445,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </set>
             <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h
             </set>
             <set var="_custom_build_include_wx_msw_genrcdefs_h">
 Creating $(SETUPHDIR)\wx\msw\rcdefs.h

+InputPath=..\..\include\wx\msw\genrcdefs.h

 
 

-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
+"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"

 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
         </if>


@@ -433,8 +468,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <include file="png.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
     <include file="png.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>

-    <include file="odbc.bkl"/>

     <include file="expat.bkl"/>
     <include file="expat.bkl"/>

+    <include file="scintilla.bkl"/>

 
 
     <!-- =============================================================== -->
 
 
     <!-- =============================================================== -->


@@ -454,20 +489,36 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
     </set>
 
         <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>
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
     <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>
         <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'">$(SETUPHDIR)</include>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>

+        <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>

         <lib-path>$(LIBDIRNAME)</lib-path>
         <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>
         <warnings>max</warnings>

+        <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>

         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
             -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
             -wcd=656 <!-- define this function inside its class definition (may improve code quality) -->


@@ -482,11 +533,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <!-- for both GUI and wxBase libs/samples: -->
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
     <!-- for both GUI and wxBase libs/samples: -->
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->

-        <sys-lib>$(LIB_TIFF)</sys-lib>
-        <sys-lib>$(LIB_JPEG)</sys-lib>
-        <sys-lib>$(LIB_PNG)</sys-lib>

         <sys-lib>$(LIB_ZLIB)</sys-lib>
         <sys-lib>$(LIB_ZLIB)</sys-lib>

-        <sys-lib>$(LIB_ODBC)</sys-lib>

         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
 
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
 


@@ -499,9 +546,19 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             </if>
         </if>
 
             </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>
         <!-- 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>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>


@@ -528,19 +585,22 @@ $(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>
                 <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>

-            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
+            <if cond="FORMAT=='borland'">

                 <sys-lib>oleacc</sys-lib>
             </if>
                 <sys-lib>oleacc</sys-lib>
             </if>

-            <if cond="FORMAT!='msevc4prj'">
-                <sys-lib>odbc32</sys-lib>
-            </if>

         </if>
     </template>
 
 
     <!-- for GUI libs/samples: -->
         </if>
     </template>
 
 
     <!-- for GUI libs/samples: -->

-    <template id="wx_append_nomono" template="wx_append_base_nomono">
+    <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>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>
 
         <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
     </template>
 


@@ -561,11 +621,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 

+        <define>WXBUILDING</define>
+

         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">

-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
-                <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
+                <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>

                 <precomp-headers-gen>
                 <precomp-headers-gen>

-                    $(WXTOPDIR)src/msw/dummy.cpp
+                    $(WXTOPDIR)src/common/dummy.cpp

                 </precomp-headers-gen>
             </if>
             <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
                 </precomp-headers-gen>
             </if>
             <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>


@@ -610,31 +672,35 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- version info resources: -->
         <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
 
         <!-- version info resources: -->

-        <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
-            <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
-            <if cond="FORMAT=='autoconf'">
-                <res-include>$(RCDEFDIR)</res-include>
-                <res-include>$(TOP_SRCDIR)include</res-include>
-            </if>
+        <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
+        <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>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>

+        

     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
     </template>
 
     <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>

+        <depends>wxscintilla</depends>

     </template>
 
     <template id="wx_3rdparty_dependencies"
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
     </template>
 
     <template id="wx_3rdparty_dependencies"
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>

-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>

         <depends>wxregex</depends>
     </template>
 
     <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
         <depends>wxregex</depends>
     </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>
         <include>$(INC_PNG)</include>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>


@@ -643,7 +709,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_3rdparty_includes"
               template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
     <template id="wx_3rdparty_includes"
               template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>

-        <include>$(INC_ODBC)</include>

         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>


@@ -686,13 +751,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </set>
     <set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
 
     </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>
     <set var="PLUGINS_INST_DIR" make_var="1">
         $(LIBDIR)/wx/$(PLUGIN_VERSION0)
     </set>


@@ -700,7 +758,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <define-rule name="wx-base-plugin" extends="module">
         <template>
             <dllname>
     <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>
             </dllname>
             <define>WXUSINGDLL</define>
             <define>wxUSE_GUI=0</define>


@@ -711,7 +769,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <define-rule name="wx-gui-plugin" extends="module">
         <template template="wx">
             <dllname>
     <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>
             </dllname>
             <define>WXUSINGDLL</define>
             <install-to>$(PLUGINS_INST_DIR)</install-to>


@@ -719,14 +777,15 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </define-rule>
 
     <!-- =============================================================== -->
     </define-rule>
 
     <!-- =============================================================== -->

-    <!--               Support for wxWidgets samples and contrib:        -->
+    <!--               Support for wxWidgets samples:                    -->

     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
     <!-- =============================================================== -->
 
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
         <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>

-        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
+        <!-- msvs200?prj formats don't support external dependencies yet: -->
+        <if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'">

             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>
             <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>