]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/makefile.vc
initial creation invisible
[wxWidgets.git] / build / msw / makefile.vc
index a80ffb6e5fe50241f254e9fa1181f1fe5aebd886..32ce43218db297ebdee1ee6c0e407d206191968d 100644 (file)
 ### Variables: ###
 
 ADVDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_advdll.pch"
 ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_dummy.obj \
@@ -39,13 +39,13 @@ ADVDLL_OBJECTS =  \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_wave.obj
 ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \
        $(____DEBUGRUNTIME_131_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch"
 ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_dummy.obj \
        $(OBJS)\advlib_calctrl.obj \
@@ -64,21 +64,22 @@ ADVLIB_OBJECTS =  \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_wave.obj
 BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
        /DwxUSE_BASE=1 $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
-       /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch"
+       /DwxUSE_BASE=1 $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_basedll.pch"
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \
@@ -129,6 +130,8 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_variant.obj \
        $(OBJS)\basedll_wfstream.obj \
        $(OBJS)\basedll_wxchar.obj \
+       $(OBJS)\basedll_xti.obj \
+       $(OBJS)\basedll_xtistrm.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \
@@ -150,21 +153,21 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj
 BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
        $(CFLAGS)
 BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(OBJS)\baselib_appbase.obj \
@@ -215,6 +218,8 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_variant.obj \
        $(OBJS)\baselib_wfstream.obj \
        $(OBJS)\baselib_wxchar.obj \
+       $(OBJS)\baselib_xti.obj \
+       $(OBJS)\baselib_xtistrm.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \
@@ -236,22 +241,22 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
 COREDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CFLAGS)
 COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_coredll.pch"
+       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CXXFLAGS) /GR /GX \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch"
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_event.obj \
@@ -263,21 +268,22 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
 CORELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
        $(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        /DwxUSE_BASE=0 $(CFLAGS)
 CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
        $(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch"
+       /DwxUSE_BASE=0 $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_corelib.pch"
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
        $(OBJS)\corelib_event.obj \
@@ -289,59 +295,59 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
 DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_dbgriddll.pch"
 DBGRIDDLL_OBJECTS =  \
        $(OBJS)\dbgriddll_dummy.obj \
        $(OBJS)\dbgriddll_dbgrid.obj
 DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.pdb \
        $(____DEBUGRUNTIME_167_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgridlib.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgridlib.pch"
 DBGRIDLIB_OBJECTS =  \
        $(OBJS)\dbgridlib_dummy.obj \
        $(OBJS)\dbgridlib_dbgrid.obj
 GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_212_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_gldll.pch"
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj
 GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_222) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \
        $(____DEBUGRUNTIME_221_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch"
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj
 HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_176_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_htmldll.pch"
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
@@ -368,13 +374,13 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj
 HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \
        $(____DEBUGRUNTIME_185_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch"
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \
@@ -399,24 +405,30 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
-LIBDIRNAME = \
-       ..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+       USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
+       VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
+       USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
 MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
        $(CFLAGS)
 MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch"
+       $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch"
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        $(OBJS)\monodll_appbase.obj \
@@ -467,6 +479,8 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_variant.obj \
        $(OBJS)\monodll_wfstream.obj \
        $(OBJS)\monodll_wxchar.obj \
+       $(OBJS)\monodll_xti.obj \
+       $(OBJS)\monodll_xtistrm.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \
@@ -499,21 +513,22 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_url.obj \
        $(OBJS)\monodll_gsocket.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
-       $(OBJS)\monodll_xml.obj
+       $(OBJS)\monodll_xml.obj \
+       $(OBJS)\monodll_xtixml.obj
 MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CFLAGS)
 MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CXXFLAGS) \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CXXFLAGS) /GR /GX \
        /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch"
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
@@ -565,6 +580,8 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_variant.obj \
        $(OBJS)\monolib_wfstream.obj \
        $(OBJS)\monolib_wxchar.obj \
+       $(OBJS)\monolib_xti.obj \
+       $(OBJS)\monolib_xtistrm.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \
@@ -597,23 +614,24 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_url.obj \
        $(OBJS)\monolib_gsocket.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
-       $(OBJS)\monolib_xml.obj
+       $(OBJS)\monolib_xml.obj \
+       $(OBJS)\monolib_xtixml.obj
 NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
        /DWXMAKINGDLL_NET $(CFLAGS)
 NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DWXMAKINGDLL_NET $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
        /Fp"$(OBJS)\wxprec_netdll.pch"
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
@@ -629,22 +647,20 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_url.obj \
        $(OBJS)\netdll_gsocket.obj
 NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_NET $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(CFLAGS)
 NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(SETUPHDIR) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
-       /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netlib.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(CXXFLAGS) /GR /GX \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch"
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
@@ -661,41 +677,44 @@ NETLIB_OBJECTS =  \
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_140_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_odbcdll.pch"
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /GR /GX \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch"
 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.obj \
        $(OBJS)\odbcdll_db.obj \
        $(OBJS)\odbcdll_dbtable.obj
 ODBCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \
-       /DWIN32 $(__DEBUGINFO_38) \
+       /DWIN32 $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.pdb \
        $(____DEBUGRUNTIME_149_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_odbclib.pch"
 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.obj \
        $(OBJS)\odbclib_db.obj \
        $(OBJS)\odbclib_dbtable.obj
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) \
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) $(____LIBDIRNAME_FILENAMES_6_p) \
        /DCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
 WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) $(CFLAGS)
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(SETUPHDIR) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \
@@ -744,7 +763,7 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
 WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
@@ -765,7 +784,7 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
 WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
@@ -773,7 +792,7 @@ WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
 WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
@@ -810,7 +829,7 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
 WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \
-       $(__DEBUGINFO_38) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \
+       $(__DEBUGINFO_36) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \
        $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS)
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
@@ -828,31 +847,40 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj
 XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_194_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmldll.pch"
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /GR /GX \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch"
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
-       $(OBJS)\xmldll_xml.obj
+       $(OBJS)\xmldll_xml.obj \
+       $(OBJS)\xmldll_xtixml.obj
 XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \
-       $(__DEBUGINFO_38) \
+       $(__DEBUGINFO_36) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \
        $(____DEBUGRUNTIME_203_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
+       /I..\..\include /I$(SETUPHDIR) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /GR /GX /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmllib.pch"
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
-       $(OBJS)\xmllib_xml.obj
+       $(OBJS)\xmllib_xml.obj \
+       $(OBJS)\xmllib_xtixml.obj
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\lib\vc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -893,28 +921,28 @@ __DEBUGINFO =
 __DEBUGINFO = d
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_33 = /DEBUG
+__DEBUGINFO_34 = /DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_33 = 
+__DEBUGINFO_34 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_33 = 
+__DEBUGINFO_34 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_33 = /DEBUG
+__DEBUGINFO_34 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_38 = /Zi
+__DEBUGINFO_36 = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_38 = 
+__DEBUGINFO_36 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_38 = 
+__DEBUGINFO_36 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_38 = /Zi
+__DEBUGINFO_36 = /Zi
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_105 = 
@@ -1177,8 +1205,14 @@ __RUNTIME_LIBS = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS = T
 !endif
+!if "$(WXUNIV)" == "0"
+__SETUP_H_SUBDIR_FILENAMES = msw
+!endif
+!if "$(WXUNIV)" == "1"
+__SETUP_H_SUBDIR_FILENAMES = univ
+!endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = /D_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -1237,6 +1271,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
+       $(OBJS)\monolib_printdlg.obj \
+       $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
@@ -1276,9 +1312,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
-       $(OBJS)\monolib_penwin.obj \
-       $(OBJS)\monolib_printdlg.obj \
-       $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
        $(OBJS)\monolib_scrolbar.obj \
@@ -1300,6 +1333,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
+       $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_cmdproc.obj \
@@ -1371,16 +1405,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \
        $(OBJS)\monolib_panelg.obj \
        $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_printps.obj \
        $(OBJS)\monolib_renderg.obj \
        $(OBJS)\monolib_scrlwing.obj \
        $(OBJS)\monolib_selstore.obj \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_treectlg.obj \
@@ -1427,6 +1462,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
+       $(OBJS)\monolib_printdlg.obj \
+       $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_renderer.obj \
        $(OBJS)\monolib_settings.obj \
@@ -1490,6 +1527,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
+       $(OBJS)\monolib_bookctrl.obj \
        $(OBJS)\monolib_choiccmn.obj \
        $(OBJS)\monolib_clipcmn.obj \
        $(OBJS)\monolib_cmdproc.obj \
@@ -1561,16 +1599,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dcpsg.obj \
        $(OBJS)\monolib_dirctrlg.obj \
        $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_listbkg.obj \
        $(OBJS)\monolib_logg.obj \
        $(OBJS)\monolib_numdlgg.obj \
        $(OBJS)\monolib_panelg.obj \
        $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_printps.obj \
        $(OBJS)\monolib_renderg.obj \
        $(OBJS)\monolib_scrlwing.obj \
        $(OBJS)\monolib_selstore.obj \
        $(OBJS)\monolib_spinctlg.obj \
        $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
        $(OBJS)\monolib_textdlgg.obj \
        $(OBJS)\monolib_tipwin.obj \
        $(OBJS)\monolib_treectlg.obj \
@@ -1617,6 +1656,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
+       $(OBJS)\coredll_printdlg.obj \
+       $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
@@ -1656,9 +1697,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
-       $(OBJS)\coredll_penwin.obj \
-       $(OBJS)\coredll_printdlg.obj \
-       $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
        $(OBJS)\coredll_scrolbar.obj \
@@ -1680,6 +1718,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
+       $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_cmdproc.obj \
@@ -1751,16 +1790,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \
        $(OBJS)\coredll_panelg.obj \
        $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_printps.obj \
        $(OBJS)\coredll_renderg.obj \
        $(OBJS)\coredll_scrlwing.obj \
        $(OBJS)\coredll_selstore.obj \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_treectlg.obj \
@@ -1807,6 +1847,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
+       $(OBJS)\coredll_printdlg.obj \
+       $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_renderer.obj \
        $(OBJS)\coredll_settings.obj \
@@ -1870,6 +1912,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
+       $(OBJS)\coredll_bookctrl.obj \
        $(OBJS)\coredll_choiccmn.obj \
        $(OBJS)\coredll_clipcmn.obj \
        $(OBJS)\coredll_cmdproc.obj \
@@ -1941,16 +1984,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dcpsg.obj \
        $(OBJS)\coredll_dirctrlg.obj \
        $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_listbkg.obj \
        $(OBJS)\coredll_logg.obj \
        $(OBJS)\coredll_numdlgg.obj \
        $(OBJS)\coredll_panelg.obj \
        $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_printps.obj \
        $(OBJS)\coredll_renderg.obj \
        $(OBJS)\coredll_scrlwing.obj \
        $(OBJS)\coredll_selstore.obj \
        $(OBJS)\coredll_spinctlg.obj \
        $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
        $(OBJS)\coredll_textdlgg.obj \
        $(OBJS)\coredll_tipwin.obj \
        $(OBJS)\coredll_treectlg.obj \
@@ -1997,6 +2041,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
+       $(OBJS)\corelib_printdlg.obj \
+       $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
@@ -2036,9 +2082,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
-       $(OBJS)\corelib_penwin.obj \
-       $(OBJS)\corelib_printdlg.obj \
-       $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
        $(OBJS)\corelib_scrolbar.obj \
@@ -2060,6 +2103,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
+       $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_cmdproc.obj \
@@ -2131,16 +2175,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \
        $(OBJS)\corelib_panelg.obj \
        $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_printps.obj \
        $(OBJS)\corelib_renderg.obj \
        $(OBJS)\corelib_scrlwing.obj \
        $(OBJS)\corelib_selstore.obj \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_treectlg.obj \
@@ -2187,6 +2232,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
+       $(OBJS)\corelib_printdlg.obj \
+       $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_renderer.obj \
        $(OBJS)\corelib_settings.obj \
@@ -2250,6 +2297,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
+       $(OBJS)\corelib_bookctrl.obj \
        $(OBJS)\corelib_choiccmn.obj \
        $(OBJS)\corelib_clipcmn.obj \
        $(OBJS)\corelib_cmdproc.obj \
@@ -2321,16 +2369,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dcpsg.obj \
        $(OBJS)\corelib_dirctrlg.obj \
        $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_listbkg.obj \
        $(OBJS)\corelib_logg.obj \
        $(OBJS)\corelib_numdlgg.obj \
        $(OBJS)\corelib_panelg.obj \
        $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_printps.obj \
        $(OBJS)\corelib_renderg.obj \
        $(OBJS)\corelib_scrlwing.obj \
        $(OBJS)\corelib_selstore.obj \
        $(OBJS)\corelib_spinctlg.obj \
        $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
        $(OBJS)\corelib_textdlgg.obj \
        $(OBJS)\corelib_tipwin.obj \
        $(OBJS)\corelib_treectlg.obj \
@@ -2377,6 +2426,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
+       $(OBJS)\monodll_printdlg.obj \
+       $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
@@ -2416,9 +2467,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
-       $(OBJS)\monodll_penwin.obj \
-       $(OBJS)\monodll_printdlg.obj \
-       $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
        $(OBJS)\monodll_scrolbar.obj \
@@ -2440,6 +2488,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
+       $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_cmdproc.obj \
@@ -2511,16 +2560,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \
        $(OBJS)\monodll_panelg.obj \
        $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_printps.obj \
        $(OBJS)\monodll_renderg.obj \
        $(OBJS)\monodll_scrlwing.obj \
        $(OBJS)\monodll_selstore.obj \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_treectlg.obj \
@@ -2567,6 +2617,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
+       $(OBJS)\monodll_printdlg.obj \
+       $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_renderer.obj \
        $(OBJS)\monodll_settings.obj \
@@ -2630,6 +2682,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
+       $(OBJS)\monodll_bookctrl.obj \
        $(OBJS)\monodll_choiccmn.obj \
        $(OBJS)\monodll_clipcmn.obj \
        $(OBJS)\monodll_cmdproc.obj \
@@ -2701,16 +2754,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dcpsg.obj \
        $(OBJS)\monodll_dirctrlg.obj \
        $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_listbkg.obj \
        $(OBJS)\monodll_logg.obj \
        $(OBJS)\monodll_numdlgg.obj \
        $(OBJS)\monodll_panelg.obj \
        $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_printps.obj \
        $(OBJS)\monodll_renderg.obj \
        $(OBJS)\monodll_scrlwing.obj \
        $(OBJS)\monodll_selstore.obj \
        $(OBJS)\monodll_spinctlg.obj \
        $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
        $(OBJS)\monodll_textdlgg.obj \
        $(OBJS)\monodll_tipwin.obj \
        $(OBJS)\monodll_treectlg.obj \
@@ -2963,6 +3017,12 @@ ____DEBUGRUNTIME_95_p = /D_DEBUG
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 ____DEBUGRUNTIME_95_p = $(____DEBUGINFO)
 !endif
+!if "$(SHARED)" == "0"
+____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+____LIBDIRNAME_FILENAMES_6_p = /I..\..\lib\vc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
@@ -3115,11 +3175,11 @@ __netdll___depname = \
 __netlib___depname = \
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
 __odbcdll___depname = \
        $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
 __odbclib___depname = \
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
 !endif
@@ -3447,6 +3507,12 @@ $(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp
 $(OBJS)\basedll_wxchar.obj: ..\..\src\common\wxchar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
+$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -3654,6 +3720,12 @@ $(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp
 $(OBJS)\baselib_wxchar.obj: ..\..\src\common\wxchar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
+$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
@@ -3723,6 +3795,11 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4261,6 +4338,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4392,9 +4474,6 @@ $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\coredll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4405,11 +4484,20 @@ $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -4621,11 +4709,6 @@ $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4831,6 +4914,11 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5369,6 +5457,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5500,9 +5593,6 @@ $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\corelib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5513,11 +5603,20 @@ $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -5729,11 +5828,6 @@ $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -6107,6 +6201,11 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6807,6 +6906,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6992,9 +7096,6 @@ $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monodll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7005,11 +7106,20 @@ $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -7281,11 +7391,6 @@ $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7479,6 +7584,15 @@ $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
+$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7554,6 +7668,11 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8254,6 +8373,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
 $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8439,9 +8563,6 @@ $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monolib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8452,11 +8573,20 @@ $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -8728,11 +8858,6 @@ $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -8926,6 +9051,15 @@ $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
+$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -9379,21 +9513,27 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
 
+$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
+
 $(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
 
+$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
+
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj  $(ADVLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(ADVLIB_OBJECTS)
@@ -9402,13 +9542,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj  $(BASELIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(BASELIB_OBJECTS)
@@ -9425,45 +9565,65 @@ clean:
        -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
        -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
        -if exist $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib del $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj  $(CORELIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(CORELIB_OBJECTS)
@@ -9472,13 +9632,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(DBGRIDLIB_OBJECTS)
@@ -9486,14 +9646,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.
 !endif
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(__coredll___depname)
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 <<
 !endif
 
 !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj  $(GLLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(GLLIB_OBJECTS)
@@ -9502,13 +9662,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj  $(HTMLLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(HTMLLIB_OBJECTS)
@@ -9518,51 +9678,54 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li
 $(LIBDIRNAME): 
        if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
 
-$(LIBDIRNAME)\wx: $(LIBDIRNAME)
-       if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
+$(SETUPHDIR): $(LIBDIRNAME)
+       if not exist $(SETUPHDIR) mkdir $(SETUPHDIR)
+
+$(SETUPHDIR)\wx: $(SETUPHDIR)
+       if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
+
+..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: 
+       if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib    /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj  $(MONOLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(MONOLIB_OBJECTS)
 <<
 !endif
 
-..\..\include\wx\msw\setup.h: 
-       if not exist ..\..\include\wx\msw\setup.h copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h
-
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj  $(NETLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(NETLIB_OBJECTS)
 <<
 !endif
 
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
 <<
 !endif
 
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(ODBCLIB_OBJECTS)
@@ -9571,13 +9734,13 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d
 
 sub_samples: 
        cd ..\..\samples
-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-$(LIBDIRNAME)\wx\setup.h: 
-       if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
+$(SETUPHDIR)\wx\setup.h: 
+       if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
-setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
+setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 
 $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
        if exist $@ del $@
@@ -9623,13 +9786,13 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34)  /LIBPATH:$(LIBDIRNAME) @<<
        $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 <<
 !endif
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
+$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj  $(XMLLIB_OBJECTS)
        if exist $@ del $@
        lib /NOLOGO /OUT:$@ @<<
        $(XMLLIB_OBJECTS)