fixed setup.h copying

[wxWidgets.git] / build / msw / makefile.vc
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index 50d190b16f33ac14c24f6f33525b575a26646cda..925117827b62db17ae810876bb8a61ee62b0e53c 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -13,11 +13,11 @@
  ### Variables: ###
  
  ADVDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) /DWIN32 \
  ### 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) \
         /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" \
         /Fp"$(OBJS)\wxprec_advdll.pch"
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DWXUSINGDLL /DWXMAKINGDLL_ADV $(CXXFLAGS) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_advdll.pch"
@@ -39,11 +39,11 @@ ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_wave.obj
  ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \
         $(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) \
         /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"
  ADVLIB_OBJECTS =  \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch"
  ADVLIB_OBJECTS =  \
@@ -64,21 +64,21 @@ ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_wave.obj
  BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
         $(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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
-       /DwxUSE_GUI=0 $(CFLAGS)
+       /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 \
  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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
-       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch"
+       /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"
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         $(OBJS)\basedll_appbase.obj \
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         $(OBJS)\basedll_appbase.obj \
@@ -150,20 +150,20 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
  BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
         $(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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
         $(CFLAGS)
  BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
         $(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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \
         $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
@@ -235,12 +235,20 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
+COREDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) /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$(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) \
  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) \
         /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"
         /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"
@@ -254,12 +262,20 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
+CORELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) /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$(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) \
  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) \
         /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"
  CORELIB_OBJECTS =  \
         /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"
  CORELIB_OBJECTS =  \
@@ -273,11 +289,11 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
  DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) \
         $(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) \
         /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" \
         /Fp"$(OBJS)\wxprec_dbgriddll.pch"
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DWXUSINGDLL /DWXMAKINGDLL_DBGRID $(CXXFLAGS) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_dbgriddll.pch"
@@ -285,22 +301,22 @@ DBGRIDDLL_OBJECTS =  \
         $(OBJS)\dbgriddll_dummy.obj \
         $(OBJS)\dbgriddll_dbgrid.obj
  DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) \
         $(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) \
         /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"
  DBGRIDLIB_OBJECTS =  \
         $(OBJS)\dbgridlib_dummy.obj \
         $(OBJS)\dbgridlib_dbgrid.obj
  GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_213) /DWIN32 \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         $(CXXFLAGS) /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) \
         /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" \
         /Fp"$(OBJS)\wxprec_gldll.pch"
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_gldll.pch"
@@ -308,22 +324,22 @@ GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
         $(OBJS)\gldll_glcanvas.obj
  GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_222) /DWIN32 \
         $(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) \
         /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"
  GLLIB_OBJECTS =  \
         $(OBJS)\gllib_dummy.obj \
         $(OBJS)\gllib_glcanvas.obj
  HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_177) \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         $(CXXFLAGS) /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) \
         /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" \
         /Fp"$(OBJS)\wxprec_htmldll.pch"
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_htmldll.pch"
@@ -352,11 +368,11 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
  HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_186) \
         $(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) \
         /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"
  HTMLLIB_OBJECTS =  \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
         $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch"
  HTMLLIB_OBJECTS =  \
@@ -383,21 +399,27 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
         $(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 \
  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) \
         /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 \
         /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) \
         /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"
         /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"
@@ -482,21 +504,20 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_socket.obj \
         $(OBJS)\monodll_url.obj \
         $(OBJS)\monodll_gsocket.obj \
         $(OBJS)\monodll_socket.obj \
         $(OBJS)\monodll_url.obj \
         $(OBJS)\monodll_gsocket.obj \
-       $(OBJS)\monodll_gsockmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj
  MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.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) \
         /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 \
         /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) \
         /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) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch"
         /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
         /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 $(CXXFLAGS) \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch"
@@ -581,25 +602,25 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_socket.obj \
         $(OBJS)\monolib_url.obj \
         $(OBJS)\monolib_gsocket.obj \
         $(OBJS)\monolib_socket.obj \
         $(OBJS)\monolib_url.obj \
         $(OBJS)\monolib_gsocket.obj \
-       $(OBJS)\monolib_gsockmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj
  NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CFLAGS)
  NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
  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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netdll.pch"
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
         $(OBJS)\netdll_fs_inet.obj \
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
         $(OBJS)\netdll_fs_inet.obj \
@@ -612,24 +633,22 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_sckstrm.obj \
         $(OBJS)\netdll_socket.obj \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_sckstrm.obj \
         $(OBJS)\netdll_socket.obj \
         $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_gsocket.obj \
-       $(OBJS)\netdll_gsockmsw.obj
+       $(OBJS)\netdll_gsocket.obj
  NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
  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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(CFLAGS)
  NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
  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) \
         /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\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch"
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
  NETLIB_OBJECTS =  \
         $(OBJS)\netlib_dummy.obj \
         $(OBJS)\netlib_fs_inet.obj \
@@ -642,46 +661,47 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_sckstrm.obj \
         $(OBJS)\netlib_socket.obj \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_sckstrm.obj \
         $(OBJS)\netlib_socket.obj \
         $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_gsocket.obj \
-       $(OBJS)\netlib_gsockmsw.obj
+       $(OBJS)\netlib_gsocket.obj
  OBJS = \
         vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
  ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \
  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) \
         /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 \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /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) \
         /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) \
         /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 \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch"
  ODBCLIB_OBJECTS =  \
         $(OBJS)\odbclib_dummy.obj \
         $(OBJS)\odbclib_db.obj \
         $(OBJS)\odbclib_dbtable.obj
  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 \
  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 \
         /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 \
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -730,7 +750,7 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
  WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \
         $(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 \
         $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\..\src\zlib $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
@@ -751,7 +771,7 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
  WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
         $(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 \
         $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
@@ -759,7 +779,7 @@ WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
  WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \
         $(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 \
         $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
@@ -796,7 +816,7 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
  WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \
         $(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 \
         $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
@@ -814,31 +834,37 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_infutil.obj \
         $(OBJS)\wxzlib_inffast.obj
  XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \
         $(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) \
         /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 \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \
         /Fp"$(OBJS)\wxprec_xmldll.pch"
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         $(OBJS)\xmldll_xml.obj
  XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \
         /Fp"$(OBJS)\wxprec_xmldll.pch"
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         $(OBJS)\xmldll_xml.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) \
         /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 \
         /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj
  
  ### Conditionally set variables: ###
  
  XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.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
  !if "$(USE_GUI)" == "0"
  PORTNAME = base
  !endif
@@ -879,28 +905,28 @@ __DEBUGINFO =
  __DEBUGINFO = d
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
  __DEBUGINFO = d
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_33 = /DEBUG
+__DEBUGINFO_34 = /DEBUG
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_33 = 
+__DEBUGINFO_34 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_33 = 
+__DEBUGINFO_34 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_33 = /DEBUG
+__DEBUGINFO_34 = /DEBUG
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_38 = /Zi
+__DEBUGINFO_36 = /Zi
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_38 = 
+__DEBUGINFO_36 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_38 = 
+__DEBUGINFO_36 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_38 = /Zi
+__DEBUGINFO_36 = /Zi
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
  __DEBUGRUNTIME_105 = 
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
  __DEBUGRUNTIME_105 = 
@@ -1163,9 +1189,18 @@ __RUNTIME_LIBS = D
  !if "$(RUNTIME_LIBS)" == "static"
  __RUNTIME_LIBS = T
  !endif
  !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
  !endif
  !if "$(UNICODE)" == "1"
  __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
  !endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
  !endif
@@ -1206,6 +1241,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_helpchm.obj \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_helpchm.obj \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
@@ -1219,6 +1255,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_palette.obj \
         $(OBJS)\monolib_pen.obj \
         $(OBJS)\monolib_popupwin.obj \
         $(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 \
         $(OBJS)\monolib_region.obj \
         $(OBJS)\monolib_renderer.obj \
         $(OBJS)\monolib_settings.obj \
@@ -1258,9 +1296,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_notebook.obj \
         $(OBJS)\monolib_access.obj \
         $(OBJS)\monolib_ownerdrw.obj \
         $(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 \
         $(OBJS)\monolib_radiobox.obj \
         $(OBJS)\monolib_radiobut.obj \
         $(OBJS)\monolib_scrolbar.obj \
@@ -1282,6 +1317,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
         $(OBJS)\monolib_bmpbase.obj \
         $(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 \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
@@ -1353,16 +1389,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_treectlg.obj \
@@ -1395,6 +1432,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
         $(OBJS)\monolib_fontutil.obj \
         $(OBJS)\monolib_gdiimage.obj \
         $(OBJS)\monolib_gdiobj.obj \
+       $(OBJS)\monolib_gsockmsw.obj \
         $(OBJS)\monolib_helpchm.obj \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
         $(OBJS)\monolib_helpchm.obj \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_icon.obj \
@@ -1408,6 +1446,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_palette.obj \
         $(OBJS)\monolib_pen.obj \
         $(OBJS)\monolib_popupwin.obj \
         $(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 \
         $(OBJS)\monolib_region.obj \
         $(OBJS)\monolib_renderer.obj \
         $(OBJS)\monolib_settings.obj \
@@ -1417,7 +1457,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_utilsgui.obj \
         $(OBJS)\monolib_uxtheme.obj \
         $(OBJS)\monolib_window.obj \
         $(OBJS)\monolib_utilsgui.obj \
         $(OBJS)\monolib_uxtheme.obj \
         $(OBJS)\monolib_window.obj \
-       $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_accel.obj \
         $(OBJS)\monolib_colrdlgg.obj \
         $(OBJS)\monolib_dirdlgg.obj \
         $(OBJS)\monolib_accel.obj \
         $(OBJS)\monolib_colrdlgg.obj \
         $(OBJS)\monolib_dirdlgg.obj \
@@ -1459,6 +1498,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_statusbr.obj \
         $(OBJS)\monolib_statline.obj \
         $(OBJS)\monolib_stattext.obj \
         $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_textctrl.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
@@ -1471,6 +1511,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_artprov.obj \
         $(OBJS)\monolib_artstd.obj \
         $(OBJS)\monolib_bmpbase.obj \
         $(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 \
         $(OBJS)\monolib_choiccmn.obj \
         $(OBJS)\monolib_clipcmn.obj \
         $(OBJS)\monolib_cmdproc.obj \
@@ -1542,16 +1583,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dcpsg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_treectlg.obj \
@@ -1584,6 +1626,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_helpchm.obj \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_helpchm.obj \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
@@ -1597,6 +1640,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_palette.obj \
         $(OBJS)\coredll_pen.obj \
         $(OBJS)\coredll_popupwin.obj \
         $(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 \
         $(OBJS)\coredll_region.obj \
         $(OBJS)\coredll_renderer.obj \
         $(OBJS)\coredll_settings.obj \
@@ -1636,9 +1681,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_notebook.obj \
         $(OBJS)\coredll_access.obj \
         $(OBJS)\coredll_ownerdrw.obj \
         $(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 \
         $(OBJS)\coredll_radiobox.obj \
         $(OBJS)\coredll_radiobut.obj \
         $(OBJS)\coredll_scrolbar.obj \
@@ -1660,6 +1702,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
         $(OBJS)\coredll_bmpbase.obj \
         $(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 \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
@@ -1731,16 +1774,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_treectlg.obj \
@@ -1773,6 +1817,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
         $(OBJS)\coredll_fontutil.obj \
         $(OBJS)\coredll_gdiimage.obj \
         $(OBJS)\coredll_gdiobj.obj \
+       $(OBJS)\coredll_gsockmsw.obj \
         $(OBJS)\coredll_helpchm.obj \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
         $(OBJS)\coredll_helpchm.obj \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_icon.obj \
@@ -1786,6 +1831,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_palette.obj \
         $(OBJS)\coredll_pen.obj \
         $(OBJS)\coredll_popupwin.obj \
         $(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 \
         $(OBJS)\coredll_region.obj \
         $(OBJS)\coredll_renderer.obj \
         $(OBJS)\coredll_settings.obj \
@@ -1795,7 +1842,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_utilsgui.obj \
         $(OBJS)\coredll_uxtheme.obj \
         $(OBJS)\coredll_window.obj \
         $(OBJS)\coredll_utilsgui.obj \
         $(OBJS)\coredll_uxtheme.obj \
         $(OBJS)\coredll_window.obj \
-       $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_accel.obj \
         $(OBJS)\coredll_colrdlgg.obj \
         $(OBJS)\coredll_dirdlgg.obj \
         $(OBJS)\coredll_accel.obj \
         $(OBJS)\coredll_colrdlgg.obj \
         $(OBJS)\coredll_dirdlgg.obj \
@@ -1837,6 +1883,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_statusbr.obj \
         $(OBJS)\coredll_statline.obj \
         $(OBJS)\coredll_stattext.obj \
         $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_textctrl.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
@@ -1849,6 +1896,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_artprov.obj \
         $(OBJS)\coredll_artstd.obj \
         $(OBJS)\coredll_bmpbase.obj \
         $(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 \
         $(OBJS)\coredll_choiccmn.obj \
         $(OBJS)\coredll_clipcmn.obj \
         $(OBJS)\coredll_cmdproc.obj \
@@ -1920,16 +1968,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dcpsg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_treectlg.obj \
@@ -1962,6 +2011,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_helpchm.obj \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_helpchm.obj \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
@@ -1975,6 +2025,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_palette.obj \
         $(OBJS)\corelib_pen.obj \
         $(OBJS)\corelib_popupwin.obj \
         $(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 \
         $(OBJS)\corelib_region.obj \
         $(OBJS)\corelib_renderer.obj \
         $(OBJS)\corelib_settings.obj \
@@ -2014,9 +2066,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_notebook.obj \
         $(OBJS)\corelib_access.obj \
         $(OBJS)\corelib_ownerdrw.obj \
         $(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 \
         $(OBJS)\corelib_radiobox.obj \
         $(OBJS)\corelib_radiobut.obj \
         $(OBJS)\corelib_scrolbar.obj \
@@ -2038,6 +2087,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
         $(OBJS)\corelib_bmpbase.obj \
         $(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 \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
@@ -2109,16 +2159,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_treectlg.obj \
@@ -2151,6 +2202,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
         $(OBJS)\corelib_fontutil.obj \
         $(OBJS)\corelib_gdiimage.obj \
         $(OBJS)\corelib_gdiobj.obj \
+       $(OBJS)\corelib_gsockmsw.obj \
         $(OBJS)\corelib_helpchm.obj \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
         $(OBJS)\corelib_helpchm.obj \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_icon.obj \
@@ -2164,6 +2216,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_palette.obj \
         $(OBJS)\corelib_pen.obj \
         $(OBJS)\corelib_popupwin.obj \
         $(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 \
         $(OBJS)\corelib_region.obj \
         $(OBJS)\corelib_renderer.obj \
         $(OBJS)\corelib_settings.obj \
@@ -2173,7 +2227,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_utilsgui.obj \
         $(OBJS)\corelib_uxtheme.obj \
         $(OBJS)\corelib_window.obj \
         $(OBJS)\corelib_utilsgui.obj \
         $(OBJS)\corelib_uxtheme.obj \
         $(OBJS)\corelib_window.obj \
-       $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_accel.obj \
         $(OBJS)\corelib_colrdlgg.obj \
         $(OBJS)\corelib_dirdlgg.obj \
         $(OBJS)\corelib_accel.obj \
         $(OBJS)\corelib_colrdlgg.obj \
         $(OBJS)\corelib_dirdlgg.obj \
@@ -2215,6 +2268,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_statusbr.obj \
         $(OBJS)\corelib_statline.obj \
         $(OBJS)\corelib_stattext.obj \
         $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_textctrl.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
@@ -2227,6 +2281,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_artprov.obj \
         $(OBJS)\corelib_artstd.obj \
         $(OBJS)\corelib_bmpbase.obj \
         $(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 \
         $(OBJS)\corelib_choiccmn.obj \
         $(OBJS)\corelib_clipcmn.obj \
         $(OBJS)\corelib_cmdproc.obj \
@@ -2298,16 +2353,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dcpsg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_treectlg.obj \
@@ -2340,6 +2396,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_helpchm.obj \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_helpchm.obj \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
@@ -2353,6 +2410,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_palette.obj \
         $(OBJS)\monodll_pen.obj \
         $(OBJS)\monodll_popupwin.obj \
         $(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 \
         $(OBJS)\monodll_region.obj \
         $(OBJS)\monodll_renderer.obj \
         $(OBJS)\monodll_settings.obj \
@@ -2392,9 +2451,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_notebook.obj \
         $(OBJS)\monodll_access.obj \
         $(OBJS)\monodll_ownerdrw.obj \
         $(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 \
         $(OBJS)\monodll_radiobox.obj \
         $(OBJS)\monodll_radiobut.obj \
         $(OBJS)\monodll_scrolbar.obj \
@@ -2416,6 +2472,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
         $(OBJS)\monodll_bmpbase.obj \
         $(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 \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
@@ -2487,16 +2544,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_treectlg.obj \
@@ -2529,6 +2587,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
         $(OBJS)\monodll_fontutil.obj \
         $(OBJS)\monodll_gdiimage.obj \
         $(OBJS)\monodll_gdiobj.obj \
+       $(OBJS)\monodll_gsockmsw.obj \
         $(OBJS)\monodll_helpchm.obj \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
         $(OBJS)\monodll_helpchm.obj \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_icon.obj \
@@ -2542,6 +2601,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_palette.obj \
         $(OBJS)\monodll_pen.obj \
         $(OBJS)\monodll_popupwin.obj \
         $(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 \
         $(OBJS)\monodll_region.obj \
         $(OBJS)\monodll_renderer.obj \
         $(OBJS)\monodll_settings.obj \
@@ -2551,7 +2612,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_utilsgui.obj \
         $(OBJS)\monodll_uxtheme.obj \
         $(OBJS)\monodll_window.obj \
         $(OBJS)\monodll_utilsgui.obj \
         $(OBJS)\monodll_uxtheme.obj \
         $(OBJS)\monodll_window.obj \
-       $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_accel.obj \
         $(OBJS)\monodll_colrdlgg.obj \
         $(OBJS)\monodll_dirdlgg.obj \
         $(OBJS)\monodll_accel.obj \
         $(OBJS)\monodll_colrdlgg.obj \
         $(OBJS)\monodll_dirdlgg.obj \
@@ -2593,6 +2653,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_statusbr.obj \
         $(OBJS)\monodll_statline.obj \
         $(OBJS)\monodll_stattext.obj \
         $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_textctrl.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
@@ -2605,6 +2666,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_artprov.obj \
         $(OBJS)\monodll_artstd.obj \
         $(OBJS)\monodll_bmpbase.obj \
         $(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 \
         $(OBJS)\monodll_choiccmn.obj \
         $(OBJS)\monodll_clipcmn.obj \
         $(OBJS)\monodll_cmdproc.obj \
@@ -2676,16 +2738,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dcpsg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(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_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_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 \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_treectlg.obj \
@@ -2938,6 +3001,12 @@ ____DEBUGRUNTIME_95_p = /D_DEBUG
  !if "$(DEBUG_RUNTIME_LIBS)" == "default"
  ____DEBUGRUNTIME_95_p = $(____DEBUGINFO)
  !endif
  !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) \
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(____CORE_SRC_FILENAMES_1_OBJECTS) \
@@ -3090,11 +3159,11 @@ __netdll___depname = \
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
  !endif
  __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
  __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
  __odbclib___depname = \
         $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
  !endif
@@ -3698,6 +3767,11 @@ $(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4114,6 +4188,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+       $(CC) /c /nologo /TC /Fo$@ $(COREDLL_CFLAGS) $**
+!endif
+
  $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
  $(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  
@@ -4231,6 +4310,11 @@ $(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4362,9 +4446,6 @@ $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4375,11 +4456,20 @@ $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  $(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) $**
  $(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
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -4591,11 +4681,6 @@ $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -4801,6 +4886,11 @@ $(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5217,6 +5307,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
+       $(CC) /c /nologo /TC /Fo$@ $(CORELIB_CFLAGS) $**
+!endif
+
  $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
  $(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  
@@ -5334,6 +5429,11 @@ $(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5465,9 +5565,6 @@ $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -5478,11 +5575,20 @@ $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  $(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) $**
  $(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
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -5694,11 +5800,6 @@ $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -6072,6 +6173,11 @@ $(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6587,8 +6693,10 @@ $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
  
  $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
  
+!if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
         $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
  $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
         $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) $**
+!endif
  
  $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6770,6 +6878,11 @@ $(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
  $(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
  $(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) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6955,9 +7068,6 @@ $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6968,11 +7078,20 @@ $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  $(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) $**
  $(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
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -7244,11 +7363,6 @@ $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  !endif
  
         $(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) $**
  
  $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
  
@@ -7517,6 +7631,11 @@ $(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8032,8 +8151,10 @@ $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
  $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
  
  $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
  
+!if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
         $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
  $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
         $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) $**
+!endif
  
  $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8215,6 +8336,11 @@ $(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp
  $(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
  $(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) $**
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8400,9 +8526,6 @@ $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8413,11 +8536,20 @@ $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  $(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) $**
  $(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
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -8689,11 +8821,6 @@ $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  !endif
  
         $(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) $**
  
  $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
  
@@ -8905,9 +9032,6 @@ $(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp
  $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
  
  $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
  
-$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(NETDLL_CFLAGS) $**
-
  $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
  $(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
  
@@ -8944,9 +9068,6 @@ $(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp
  $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
  
  $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.c
         $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
  
-$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.c
-       $(CC) /c /nologo /TC /Fo$@ $(NETLIB_CFLAGS) $**
-
  $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
  $(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
  
@@ -9353,14 +9474,14 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
         $(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: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__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) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(ADVLIB_OBJECTS)
@@ -9368,14 +9489,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__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) @<<
-       $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(BASELIB_OBJECTS)
@@ -9423,14 +9544,14 @@ clean:
         -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"
         -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: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__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) @<<
-       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(CORELIB_OBJECTS)
@@ -9438,14 +9559,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__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) @<<
-       $(DBGRIDDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(DBGRIDLIB_OBJECTS)
@@ -9453,14 +9574,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__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) @<<
-       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(GLLIB_OBJECTS)
@@ -9468,14 +9589,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__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) @<<
-       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(HTMLLIB_OBJECTS)
@@ -9485,61 +9606,69 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.li
  $(LIBDIRNAME): 
         if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
  
  $(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"
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__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) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj $(__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
  
         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"
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__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) @<<
-       $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj $(__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 exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(NETLIB_OBJECTS)
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__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) @<<
-       $(ODBCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+!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_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
  
  <<
  !endif
  
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj $(__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)
  <<
  !endif
  
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(ODBCLIB_OBJECTS)
  <<
  !endif
  
-$(LIBDIRNAME)\wx\setup.h: 
-       if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
+sub_samples: 
+       cd ..\..\samples
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+$(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 $@
  
  $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
         if exist $@ del $@
@@ -9584,14 +9713,14 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
  <<
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  <<
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
-$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__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) @<<
-       $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  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
+$(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_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"
  <<
  !endif
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
-$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj $(__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)
         if exist $@ del $@
         lib /NOLOGO /OUT:$@ @<<
         $(XMLLIB_OBJECTS)