diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index 5caf700673..067576cc61 100644
--- a/distrib/msw/tmake/vc6app.t
+++ b/distrib/msw/tmake/vc6app.t
@@ -3,9 +3,11 @@
 #! Purpose: tmake template file from which the VC++ 6.0 project file for
 #!          building wxWindows applications are generated by running
 #!                  tmake -t vc6lib wxwin.pro -o wxvc.dsp
-#!          you may append CONFIG+= to the end of the line, i.e.
-#!                  tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=unicode
-#!                  tmake -t vc6lib wxwin.pro -o wxvc.dsp CONFIG+=dll
+#!          you may select the configurations to include into the generated
+#!          project file by setting WXCONFIGS tag, i.e.:
+#!                  tmake ... 'WXCONFIGS += DebugUnicode ReleaseUnicode'
+#!                  tmake ... 'WXCONFIGS = *'
+#!          (in the last example all configurations will be included)
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
 #! Version: $Id$
@@ -15,25 +17,20 @@
     #! output dir
     $KIND="";
 
-    if ( Config("wx") ) {
-	Project('CONFIG += windows');
-    }
     if ( Config("wxbase") || Config("wxuniv") ) {
 	Project('CONFIG += wx');
     }
+    if ( Config("wx") && !Config("wxbase") ) {
+	Project('CONFIG += windows');
+    }
     if ( Config("wx") ) {
 	if ( Config("wxnodir") ) {
+	    #! hard code relative paths
 	    $WXDIR = "..\\..";
 	}
 	else {
 	    #! VC 6.0 supports env vars in include path
-	    #! $WXDIR = $ENV{'WX'};
-	    if ( $ENV{'wx'} ) {
-		$WXDIR = "\$(wx)";
-	    }
-	    else {
-		$WXDIR = "\$(WXWIN)";
-	    }
+	    $WXDIR = "\$(WXWIN)";
 	}
 
 	AddIncludePath("$WXDIR\\include");
@@ -83,6 +80,18 @@
     }
 
     if ( Config("wx") ) {
+	if ( !Project('WXCONFIGS') ) {
+	    #! default value
+	    Project('WXCONFIGS = Debug Release DebugDll ReleaseDll');
+	}
+	elsif ( Project('WXCONFIGS') == '*' ) {
+	    #! special value: generate all configs
+	    Project('WXCONFIGS = Debug Release DebugDll ReleaseDll DebugUnicode ReleaseUnicode DebugUnicodeDll ReleaseUnicodeDll');
+	}
+
+	#! we must use !IF the first time but !ELSEIF the subsequent ones
+	Project('__IF = !IF');
+
 	if ( Config("wxbase") ) {
 	    $KIND="Base";
 	    $TOOLKIT="base";
@@ -237,14 +246,30 @@ CFG=#$ Substitute('$$TARGET - Win32 Debug');
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug DLL" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Release DLL" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode" (based on "$$VC_PROJ_TYPE")');
-!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || DisableOutput()
 !MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode DLL" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Release Unicode" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug Unicode" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Release DLL" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug DLL" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Release" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || DisableOutput()
+!MESSAGE #$ Substitute('"$$TARGET - Win32 Debug" (based on "$$VC_PROJ_TYPE")');
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput()
 !MESSAGE 
 
 # Begin Project
@@ -254,203 +279,8 @@ CPP=cl.exe
 #$ Config("windows") && ($text='MTL=midl.exe');
 RSC=rc.exe
 
-!IF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ $text = "\"${KIND}Debug\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir #$ $text = "\"${KIND}Debug\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}Debug\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ $text = "'$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_SETUPH_DEBUG'}'";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir #$ $text = "\"${KIND}Release\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir #$ $text = "\"${KIND}Release\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}Release\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
-# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_SETUPH_RELEASE'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug DLL"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugDll\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugDll\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir #$ $text = "\"${KIND}DebugDll\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugDll\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_DEBUG_DLL'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_DLL'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release DLL"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseDll\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir #$ $text = "\"${KIND}ReleaseDll\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
-# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_RELEASE_DLL'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_DLL'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug Unicode"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicode\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicode\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicode\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicode\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release Unicode"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
-# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"');
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
-# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
-# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
-#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
-# PROP Target_Dir ""
-# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
-# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE_DLL'}";
-#$ Config("windows") || DisableOutput();
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-#$ Config("windows") || EnableOutput();
-# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
-# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE_DLL'}";
-
-!ELSEIF  "$(CFG)" == #$ Substitute('"$$TARGET - Win32 Release Unicode DLL"');
+#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute('$$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode DLL"');
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -478,18 +308,245 @@ LINK32=link.exe
 # ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
 # ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE_DLL'}";
 
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicodeDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode DLL"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicodeDll\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
+# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE_DLL'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE_DLL'}";
+
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bReleaseUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release Unicode"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseUnicode\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
+# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_RELEASE_UNICODE'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_UNICODE'}";
+
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicode\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bDebugUnicode\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug Unicode"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugUnicode\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugUnicode\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir #$ $text = "\"${KIND}DebugUnicode\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugUnicode\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
+# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_UNICODE'} $project{'WX_SETUPH_DEBUG_UNICODE'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_UNICODE'}";
+
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bReleaseDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release DLL"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir #$ $text = "\"${KIND}ReleaseDll\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir #$ $text = "\"${KIND}ReleaseDll\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}ReleaseDll\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
+# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_RELEASE_DLL'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE_DLL'}";
+
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bDebugDll\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug DLL"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir #$ $text = "\"${KIND}DebugDll\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}DebugDll\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir #$ $text = "\"${KIND}DebugDll\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}DebugDll\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
+# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_CPP_DLL'} $project{'WX_SETUPH_DEBUG_DLL'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG_DLL'}";
+
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bRelease\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Release"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir #$ $text = "\"${KIND}Release\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir #$ $text = "\"${KIND}Release\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}Release\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
+# ADD CPP #$ $text = "$project{'VC_CPP_RELEASE'} $project{'WX_CPP_RELEASE'} $project{'WX_SETUPH_RELEASE'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "NDEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_RELEASE");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_RELEASE'} $project{'WX_LINK_RELEASE'}";
+
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput()
+#$ if ( Project('WXCONFIGS') !~ '\bDebug\b' ) { Project('__IF = !ELSEIF'); DisableOutput() };
+#$ Substitute(' $$__IF "$(CFG)" == "$$TARGET - Win32 Debug"');
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir #$ $text = "\"${KIND}Debug\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug\""
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir #$ $text = "\"${KIND}Debug\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}Debug\""
+#$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
+# PROP Target_Dir ""
+# ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
+# ADD CPP #$ $text = "$project{'VC_CPP_DEBUG'} $project{'WX_CPP_DEBUG'} $project{'WX_SETUPH_DEBUG'}";
+#$ Config("windows") || DisableOutput();
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+#$ Config("windows") || EnableOutput();
+# ADD BASE RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+# ADD RSC /l 0x409 /d "_DEBUG" #$ Expand("VC_CPP_INCLUDE");
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 #$ Expand("VC_BASE_LINK_DEBUG");
+# ADD LINK32 #$ $text = "$project{'VC_LINK_DEBUG'} $project{'WX_LINK_DEBUG'}";
+
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput()
 !ENDIF 
 
 # Begin Target
 
-# Name #$ Substitute('"$$TARGET - Win32 Debug"');
-# Name #$ Substitute('"$$TARGET - Win32 Release"');
-# Name #$ Substitute('"$$TARGET - Win32 Debug DLL"');
-# Name #$ Substitute('"$$TARGET - Win32 Release DLL"');
-# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode"');
-# Name #$ Substitute('"$$TARGET - Win32 Release Unicode"');
-# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || DisableOutput()
 # Name #$ Substitute('"$$TARGET - Win32 Release Unicode DLL"');
+#$ Project('WXCONFIGS') =~ '\bReleaseUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode DLL"');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Release Unicode"');
+#$ Project('WXCONFIGS') =~ '\bUnicodeDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Debug Unicode"');
+#$ Project('WXCONFIGS') =~ '\bDebugUnicode\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Release DLL"');
+#$ Project('WXCONFIGS') =~ '\bReleaseDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Debug DLL"');
+#$ Project('WXCONFIGS') =~ '\bDebugDll\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Release"');
+#$ Project('WXCONFIGS') =~ '\bRelease\b' || EnableOutput()
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || DisableOutput()
+# Name #$ Substitute('"$$TARGET - Win32 Debug"');
+#$ Project('WXCONFIGS') =~ '\bDebug\b' || EnableOutput()
 #${
     foreach $n ( sort keys %file_names ) {
 	$f  = $file_names{$n};
@@ -504,4 +561,4 @@ LINK32=link.exe
 #$}
 # End Target
 # End Project
-#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:
+#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=perl:
diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t
new file mode 100644
index 0000000000..1fad86dc39
--- /dev/null
+++ b/distrib/msw/tmake/vc6msw.t
@@ -0,0 +1,307 @@
+#!#############################################################################
+#! File:    vc6msw.t
+#! Purpose: tmake template file from which the VC++ 6.0 project file for
+#!          building all configurations of wxMSW library wxWindows.dsp
+#!          is generated by running
+#!                  tmake -t vc6msw wxwin.pro -o wxWindows.dsp
+#! Author:  Vadim Zeitlin
+#! Created: 29.09.01
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+	next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+	$project{"WXGENERICSRCS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+	next if $wxCommon{$file} =~ /\b16\b/;
+
+	my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
+	$project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+	next if $wxMSW{$file} =~ /\b16\b/;
+
+	my $tag;
+	if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+	else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
+	$project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+	next if $wxHTML{$file} =~ /\b16\b/;
+	$project{"WXHTMLSRCS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxWXINCLUDE) {
+	next if $file =~ /setup.h/;
+	next if $file =~ /[^.]*.cpp$/;
+	$project{"WXHEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxGENERICINCLUDE) {
+	next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+	$project{"WXGENERICHEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSWINCLUDE) {
+	next if $file =~ /setup0?.h/;
+	$project{"WXMSWHEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTMLINCLUDE) {
+	$project{"WXHTMLHEADERS"} .= $file . " "
+    }
+#$}
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=wxWindows - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "wxWindows"
+# PROP Scc_LocalPath ".."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . '.dll"'
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw#$ $text = $project{"WXVERSION"} . 'd.dll"'
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../Release"
+# PROP BASE Intermediate_Dir "../Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../Release"
+# PROP Intermediate_Dir "../Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../Debug"
+# PROP BASE Intermediate_Dir "../Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../Debug"
+# PROP Intermediate_Dir "../Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWindows - Win32 Release DLL"
+# Name "wxWindows - Win32 Debug DLL"
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
+# Begin Group "Common Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+# Begin Source File
+
+SOURCE=.\common\y_tab.c
+# ADD CPP /W1 /D "USE_DEFINE"
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group
+# Begin Group "Generic Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\generic\\", "\n# End Source File\n");
+# End Group
+# Begin Group "wxHTML Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\html\\", "\n# End Source File\n");
+# End Group
+# Begin Group "MSW Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
+#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+# End Group
+# Begin Group "OLE Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n");
+# End Group
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup0.h
+!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\msw\wx\setup.h
+
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswd\wx\setup.h
+
+# End Custom Build
+!ENDIF 
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\", "\n# End Source File\n");
+# End Group
+# Begin Group "MSW"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXMSWHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\msw\\", "\n# End Source File\n");
+# End Group
+# Begin Group "Generic"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXGENERICHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\generic\\", "\n# End Source File\n");
+# End Group
+# Begin Group "HTML"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXHTMLHEADERS", "# Begin Source File\n\nSOURCE=..\\include\\wx\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=..\\include\\wx\\html\\", "\n# End Source File\n");
+# End Group
+# End Group
+# End Target
+# End Project
+#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=perl:
diff --git a/samples/minimal/MinimalVC.dsp b/samples/minimal/MinimalVC.dsp
index 9e3e867927..02bb15a19e 100644
--- a/samples/minimal/MinimalVC.dsp
+++ b/samples/minimal/MinimalVC.dsp
@@ -1,66 +1,40 @@
-# Microsoft Developer Studio Project File - Name="MinimalVC" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="minimal" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=MinimalVC - Win32 UnivDebug
+CFG=minimal - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "MinimalVC.mak".
+!MESSAGE NMAKE /f "minimal.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "MinimalVC.mak" CFG="MinimalVC - Win32 UnivDebug"
+!MESSAGE NMAKE /f "minimal.mak" CFG="minimal - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "MinimalVC - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "MinimalVC - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "MinimalVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
-!MESSAGE "MinimalVC - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "MinimalVC - Win32 UnivRelease" (based on "Win32 (x86) Application")
-!MESSAGE "MinimalVC - Win32 UnivDebug" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Release DLL" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug Unicode" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Release Unicode" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug Unicode DLL" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Release Unicode DLL" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "MinimalVC - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/minimal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Debug"
+!IF  "$(CFG)" == "minimal - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -73,170 +47,220 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP '/nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /I$(wx)\lib\mswd '
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/minimal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\zlib.lib $(wx)\lib\regex.lib $(wx)\lib\png.lib $(wx)\lib\jpeg.lib $(wx)\lib\tiff.lib $(wx)\lib\wxmswd.lib
 
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDLL"
-# PROP BASE Intermediate_Dir "DebugDLL"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_2d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/minimal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Release DLL"
+!ELSEIF  "$(CFG)" == "minimal - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDLL"
-# PROP BASE Intermediate_Dir "ReleaseDLL"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /I$(wx)\lib\msw 
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_2.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/minimal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\zlibd.lib $(wx)\lib\regexd.lib $(wx)\lib\pngd.lib $(wx)\lib\jpegd.lib $(wx)\lib\tiffd.lib $(wx)\lib\wxmsw.lib
 
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 UnivRelease"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "UnivRelease"
-# PROP BASE Intermediate_Dir "UnivRelease"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "UnivRelease"
-# PROP Intermediate_Dir "UnivRelease"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../include" /I "../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/minimal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx_univ.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"UnivRelease/minimal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 UnivDebug"
+!ELSEIF  "$(CFG)" == "minimal - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MinimalVC___Win32_UnivDebug"
-# PROP BASE Intermediate_Dir "MinimalVC___Win32_UnivDebug"
-# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Output_Dir "DebugDll"
+# PROP BASE Intermediate_Dir "DebugDll"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "UnivDebug"
-# PROP Intermediate_Dir "UnivDebug"
+# PROP Output_Dir "DebugDll"
+# PROP Intermediate_Dir "DebugDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /I$(wx)\lib\mswd 
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/minimal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx_univd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"UnivDebug/minimal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\wxmsw232d.lib
+
+!ELSEIF  "$(CFG)" == "minimal - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseDll"
+# PROP BASE Intermediate_Dir "ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDll"
+# PROP Intermediate_Dir "ReleaseDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /I$(wx)\lib\msw 
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\wxmsw232.lib
+
+!ELSEIF  "$(CFG)" == "minimal - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugUnicode"
+# PROP BASE Intermediate_Dir "DebugUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugUnicode"
+# PROP Intermediate_Dir "DebugUnicode"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswud 
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\zlib.lib $(wx)\lib\regex.lib $(wx)\lib\png.lib $(wx)\lib\jpeg.lib $(wx)\lib\tiff.lib $(wx)\lib\wxmswud.lib
+
+!ELSEIF  "$(CFG)" == "minimal - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseUnicode"
+# PROP BASE Intermediate_Dir "ReleaseUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseUnicode"
+# PROP Intermediate_Dir "ReleaseUnicode"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswu 
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\zlibd.lib $(wx)\lib\regexd.lib $(wx)\lib\pngd.lib $(wx)\lib\jpegd.lib $(wx)\lib\tiffd.lib $(wx)\lib\wxmswu.lib
+
+!ELSEIF  "$(CFG)" == "minimal - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugUnicodeDll"
+# PROP BASE Intermediate_Dir "DebugUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugUnicodeDll"
+# PROP Intermediate_Dir "DebugUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswud 
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\wxmsw232ud.lib
+
+!ELSEIF  "$(CFG)" == "minimal - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseUnicodeDll"
+# PROP BASE Intermediate_Dir "ReleaseUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseUnicodeDll"
+# PROP Intermediate_Dir "ReleaseUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
+# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswu 
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\wxmsw232u.lib
 
 !ENDIF 
 
 # Begin Target
 
-# Name "MinimalVC - Win32 Release"
-# Name "MinimalVC - Win32 Debug"
-# Name "MinimalVC - Win32 Debug DLL"
-# Name "MinimalVC - Win32 Release DLL"
-# Name "MinimalVC - Win32 UnivRelease"
-# Name "MinimalVC - Win32 UnivDebug"
+# Name "minimal - Win32 Debug"
+# Name "minimal - Win32 Release"
+# Name "minimal - Win32 Debug DLL"
+# Name "minimal - Win32 Release DLL"
+# Name "minimal - Win32 Debug Unicode"
+# Name "minimal - Win32 Release Unicode"
+# Name "minimal - Win32 Debug Unicode DLL"
+# Name "minimal - Win32 Release Unicode DLL"
 # Begin Source File
 
 SOURCE=.\minimal.cpp
-
-!IF  "$(CFG)" == "MinimalVC - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Debug DLL"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 Release DLL"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 UnivRelease"
-
-!ELSEIF  "$(CFG)" == "MinimalVC - Win32 UnivDebug"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 
 SOURCE=.\minimal.rc
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809 /i "../../include" /i "../../contrib/include"
 # End Source File
 # End Target
 # End Project
diff --git a/samples/minimal/minimal.dsp b/samples/minimal/minimal.dsp
index 02bb15a19e..075ef7f64d 100644
--- a/samples/minimal/minimal.dsp
+++ b/samples/minimal/minimal.dsp
@@ -17,14 +17,10 @@ CFG=minimal - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "minimal - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Debug DLL" (based on "Win32 (x86) Application")
 !MESSAGE "minimal - Win32 Release DLL" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Debug Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Release Unicode" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Debug Unicode DLL" (based on "Win32 (x86) Application")
-!MESSAGE "minimal - Win32 Release Unicode DLL" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "minimal - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -34,85 +30,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "minimal - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP '/nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /I$(wx)\lib\mswd '
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\zlib.lib $(wx)\lib\regex.lib $(wx)\lib\png.lib $(wx)\lib\jpeg.lib $(wx)\lib\tiff.lib $(wx)\lib\wxmswd.lib
-
-!ELSEIF  "$(CFG)" == "minimal - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /I$(wx)\lib\msw 
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\zlibd.lib $(wx)\lib\regexd.lib $(wx)\lib\pngd.lib $(wx)\lib\jpegd.lib $(wx)\lib\tiffd.lib $(wx)\lib\wxmsw.lib
-
-!ELSEIF  "$(CFG)" == "minimal - Win32 Debug DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugDll"
-# PROP BASE Intermediate_Dir "DebugDll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDll"
-# PROP Intermediate_Dir "DebugDll"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /I$(wx)\lib\mswd 
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\wxmsw232d.lib
-
-!ELSEIF  "$(CFG)" == "minimal - Win32 Release DLL"
+!ELSEIF "$(CFG)" == "minimal - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -126,134 +44,104 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /I$(wx)\lib\msw 
+# ADD CPP /nologo /W4 /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /I..\..\lib\msw 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\wxmsw232.lib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw232.lib
 
-!ELSEIF  "$(CFG)" == "minimal - Win32 Debug Unicode"
+!ELSEIF "$(CFG)" == "minimal - Win32 Debug DLL"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugUnicode"
-# PROP BASE Intermediate_Dir "DebugUnicode"
+# PROP BASE Output_Dir "DebugDll"
+# PROP BASE Intermediate_Dir "DebugDll"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugUnicode"
-# PROP Intermediate_Dir "DebugUnicode"
+# PROP Output_Dir "DebugDll"
+# PROP Intermediate_Dir "DebugDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswud 
+# ADD CPP /nologo /W4 /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /I..\..\lib\mswd 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\zlib.lib $(wx)\lib\regex.lib $(wx)\lib\png.lib $(wx)\lib\jpeg.lib $(wx)\lib\tiff.lib $(wx)\lib\wxmswud.lib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw232d.lib
 
-!ELSEIF  "$(CFG)" == "minimal - Win32 Release Unicode"
+!ELSEIF "$(CFG)" == "minimal - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUnicode"
-# PROP BASE Intermediate_Dir "ReleaseUnicode"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUnicode"
-# PROP Intermediate_Dir "ReleaseUnicode"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswu 
+# ADD CPP /nologo /W4 /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /I..\..\lib\msw 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "..\..\include"
+# ADD RSC /l 0x409 /d "NDEBUG" /I "..\..\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\zlibd.lib $(wx)\lib\regexd.lib $(wx)\lib\pngd.lib $(wx)\lib\jpegd.lib $(wx)\lib\tiffd.lib $(wx)\lib\wxmswu.lib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 ..\..\lib\zlib.lib ..\..\lib\regex.lib ..\..\lib\png.lib ..\..\lib\jpeg.lib ..\..\lib\tiff.lib ..\..\lib\wxmsw.lib
 
-!ELSEIF  "$(CFG)" == "minimal - Win32 Debug Unicode DLL"
+!ELSEIF "$(CFG)" == "minimal - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugUnicodeDll"
-# PROP BASE Intermediate_Dir "DebugUnicodeDll"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugUnicodeDll"
-# PROP Intermediate_Dir "DebugUnicodeDll"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W4 /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /D WXUSINGDLL  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswud 
+# ADD CPP /nologo /W4 /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MDd /D "__WXDEBUG__" /D "WXDEBUG=1"  /I..\..\lib\mswd 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "_DEBUG" /I "$(wx)\include"
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /I "..\..\include"
+# ADD RSC /l 0x409 /d "_DEBUG" /I "..\..\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept $(wx)\lib\wxmsw232ud.lib
-
-!ELSEIF  "$(CFG)" == "minimal - Win32 Release Unicode DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUnicodeDll"
-# PROP BASE Intermediate_Dir "ReleaseUnicodeDll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseUnicodeDll"
-# PROP Intermediate_Dir "ReleaseUnicodeDll"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /YX /FD /c
-# ADD CPP /nologo /W4 /O2 /I "$(wx)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINVER=0x400 /D WIN32 /D WINVER=0x400 /D _MT /D wxUSE_GUI=1 /YX /FD /c /MD  /D WXUSINGDLL  /D _UNICODE /D UNICODE  /I$(wx)\lib\mswu 
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-# ADD RSC /l 0x409 /d "NDEBUG" /I "$(wx)\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /machine:I386 $(wx)\lib\wxmsw232u.lib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\zlibd.lib ..\..\lib\regexd.lib ..\..\lib\pngd.lib ..\..\lib\jpegd.lib ..\..\lib\tiffd.lib ..\..\lib\wxmswd.lib
 
 !ENDIF 
 
 # Begin Target
 
-# Name "minimal - Win32 Debug"
-# Name "minimal - Win32 Release"
-# Name "minimal - Win32 Debug DLL"
 # Name "minimal - Win32 Release DLL"
-# Name "minimal - Win32 Debug Unicode"
-# Name "minimal - Win32 Release Unicode"
-# Name "minimal - Win32 Debug Unicode DLL"
-# Name "minimal - Win32 Release Unicode DLL"
+# Name "minimal - Win32 Debug DLL"
+# Name "minimal - Win32 Release"
+# Name "minimal - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\minimal.cpp
diff --git a/samples/minimal/minimal.dsw b/samples/minimal/minimal.dsw
index 30fc81587a..ead50fff92 100644
--- a/samples/minimal/minimal.dsw
+++ b/samples/minimal/minimal.dsw
@@ -12,28 +12,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name wx
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxdll
+    Project_Dep_Name wxWindows
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "wx"=..\..\src\wx.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxdll"=..\..\src\wxdll.dsp - Package Owner=<4>
+Project: "wxWindows"=..\..\src\wxWindows.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/samples/minimal/minimal.pro b/samples/minimal/minimal.pro
index e3caf9dd6c..e6a49e395d 100644
--- a/samples/minimal/minimal.pro
+++ b/samples/minimal/minimal.pro
@@ -7,6 +7,10 @@ TEMPLATE = vc6app
 # wx is mandatory for wxWindows projects
 CONFIG  = wx
 
+# the configurations of wxWindows we want to use: the value below is the
+# default one; possible other values are {Debug|Release}Unicode[Dll]
+#WXCONFIGS = Debug Release DebugDll ReleaseDll
+
 # project files
 SOURCES = minimal.cpp
 RC_FILE = minimal.rc
diff --git a/src/wx.dsp b/src/wxWindows.dsp
similarity index 90%
rename from src/wx.dsp
rename to src/wxWindows.dsp
index b13c29a66b..6aafa79b07 100644
--- a/src/wx.dsp
+++ b/src/wxWindows.dsp
@@ -1,34 +1,89 @@
-# Microsoft Developer Studio Project File - Name="wx" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=wx - Win32 Debug
+CFG=wxWindows - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "wx.mak".
+!MESSAGE NMAKE /f "wxWindows.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "wx.mak" CFG="wx - Win32 Debug"
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wx - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wx - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wx"
+# PROP Scc_ProjName "wxWindows"
 # PROP Scc_LocalPath ".."
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "wx - Win32 Release"
+!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmswd.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmswd.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,7 +106,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wx - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -78,8 +133,10 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "wx - Win32 Release"
-# Name "wx - Win32 Debug"
+# Name "wxWindows - Win32 Release DLL"
+# Name "wxWindows - Win32 Debug DLL"
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -1227,7 +1284,23 @@ SOURCE=.\msw\ole\uuid.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\msw\setup0.h
-!IF  "$(CFG)" == "wx - Win32 Release"
+!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 # Begin Custom Build - Creating wx/setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup0.h
 
@@ -1235,7 +1308,7 @@ InputPath=..\include\wx\msw\setup0.h
 	copy $(InputPath) ..\lib\msw\wx\setup.h
 
 # End Custom Build
-!ELSEIF  "$(CFG)" == "wx - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
 # Begin Custom Build - Creating wx/setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup0.h
 
diff --git a/src/wx.dsw b/src/wxWindows.dsw
similarity index 96%
rename from src/wx.dsw
rename to src/wxWindows.dsw
index 0dc95a22f8..6b8c551d6a 100644
--- a/src/wx.dsw
+++ b/src/wxWindows.dsw
@@ -51,7 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "wx"=.\wx.dsp - Package Owner=<4>
+Project: "wxWindows"=.\wxWindows.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/src/wxbase.dsp b/src/wxbase.dsp
deleted file mode 100644
index 4e77c3a643..0000000000
--- a/src/wxbase.dsp
+++ /dev/null
@@ -1,759 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxBase - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wxBase.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxBase.mak" CFG="wxBase - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxBase - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxBase - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxBase - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "lib"
-# PROP BASE Intermediate_Dir "..\BaseRelease"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "lib"
-# PROP Intermediate_Dir "..\BaseRelease"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxBase.lib"
-
-!ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "lib"
-# PROP BASE Intermediate_Dir "..\BaseDebug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "lib"
-# PROP Intermediate_Dir "..\BaseDebug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"../lib/wxBase.bsc"
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxBased.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxBase - Win32 Release"
-# Name "wxBase - Win32 Debug"
-
-# Begin Group "Common Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\common\appcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cmdline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\config.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datetime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\db.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dbtable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dircmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynarray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynlib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\encconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\event.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ffile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fileconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filefn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filename.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filesys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fontmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_inet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_mem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_zip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ftp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\hash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\http.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\intl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ipcbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\log.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\longlong.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\memory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mimecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\objstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\process.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\protocol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\regex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckaddr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckipc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\serbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\socket.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\strconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\stream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\string.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sysopt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\textfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\timercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\tokenzr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\url.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\utilscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\variant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wfstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wxchar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zipstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\init.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# End Group
-# Begin Group "MSW Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dde.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\regconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\snglinst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\thread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utilsexc.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# End Group
-# Begin Group "Headers"
-
-# PROP Default_Filter ""
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\setup0.h
-
-!IF  "$(CFG)" == "wxBase - Win32 Release"
-
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
-
-"../lib/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\base\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
-
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
-
-"../lib/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\based\wx\setup.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\app.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\buffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cmdline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\confbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbtable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dir.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\encconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ffile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fileconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filefn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filename.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filesys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_inet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_mem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_zip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gsocket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\intl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ioswrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ipcbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\longlong.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mimetype.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\module.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\objstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckaddr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckipc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\serbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\snglinst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\strconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sysopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\textfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\thread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tokenzr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\txtstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\url.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\variant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wfstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxprec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zipstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zstream.h
-# End Source File
-
-# End Group
-# Begin Group "MSW"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\dde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\mimetype.h
-# End Source File
-
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/src/wxbase.dsw b/src/wxbase.dsw
deleted file mode 100644
index ab0266b3cb..0000000000
--- a/src/wxbase.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxBase"=.\wxbase.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/wxbdll.dsp b/src/wxbdll.dsp
deleted file mode 100644
index feaab212aa..0000000000
--- a/src/wxbdll.dsp
+++ /dev/null
@@ -1,769 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxBaseDll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=wxBaseDll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wxBaseDll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxBaseDll.mak" CFG="wxBaseDll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxBaseDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxBaseDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxBaseDll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "../lib"
-# PROP BASE Intermediate_Dir "../BaseDllRelease"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "../BaseDllRelease"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../lib/wxbase232.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase232.dll"
-
-!ELSEIF  "$(CFG)" == "wxBaseDll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../lib"
-# PROP BASE Intermediate_Dir "../BaseDllDebug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "../BaseDllDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232d.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232d.dll"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxBaseDll - Win32 Release"
-# Name "wxBaseDll - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\common\base.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dummydll.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Group "Common Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\common\appcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cmdline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\config.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datetime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\db.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dbtable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dircmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynarray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynlib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\encconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\event.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ffile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fileconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filefn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filename.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filesys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fontmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_inet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_mem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_zip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ftp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\hash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\http.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\intl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ipcbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\log.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\longlong.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\memory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mimecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\objstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\process.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\protocol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\regex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckaddr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckipc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\serbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\socket.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\strconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\stream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\string.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sysopt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\textfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\timercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\tokenzr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\url.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\utilscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\variant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wfstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wxchar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zipstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\init.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# End Group
-# Begin Group "MSW Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\dde.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\regconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\snglinst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\thread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utilsexc.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# End Group
-# Begin Group "Headers"
-
-# PROP Default_Filter ""
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\setup0.h
-
-!IF  "$(CFG)" == "wxBaseDll - Win32 Release"
-
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
-
-"../lib/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\basedll\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "wxBaseDll - Win32 Debug"
-
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
-
-"../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\basedlld\wx\setup.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\app.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\buffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cmdline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\confbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbtable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dir.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\encconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ffile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fileconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filefn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filename.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filesys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_inet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_mem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_zip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gsocket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\intl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ioswrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ipcbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\longlong.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mimetype.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\module.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\objstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckaddr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckipc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\serbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\snglinst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\strconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sysopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\textfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\thread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tokenzr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\txtstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\url.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\variant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wfstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxprec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zipstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zstream.h
-# End Source File
-
-# End Group
-# Begin Group "MSW"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\dde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\mimetype.h
-# End Source File
-
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/src/wxbdll.dsw b/src/wxbdll.dsw
deleted file mode 100644
index 6d4082d0bb..0000000000
--- a/src/wxbdll.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxBaseDll"=.\wxbdll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/wxuniv.dsp b/src/wxuniv.dsp
deleted file mode 100644
index 68134c5b86..0000000000
--- a/src/wxuniv.dsp
+++ /dev/null
@@ -1,2295 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxuniv" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxuniv - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wxuniv.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxuniv.mak" CFG="wxuniv - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxuniv - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxuniv - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wxuniv"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxuniv - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "../lib"
-# PROP BASE Intermediate_Dir "../UnivRelease"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "../UnivRelease"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/univ" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "__WXUNIVERSAL__" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
-
-!ELSEIF  "$(CFG)" == "wxuniv - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "../lib"
-# PROP BASE Intermediate_Dir "../UnivDebug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "../UnivDebug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/univd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "__WXUNIVERSAL__" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxunivd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxuniv - Win32 Release"
-# Name "wxuniv - Win32 Debug"
-# Begin Group "Common Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\common\appcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\choiccmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\clipcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cmdline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cmdproc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cmndata.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\config.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\containr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\cshelp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ctrlsub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datetime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\datstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\db.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dbgrid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dbtable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dcbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dircmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dlgcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dndcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dobjcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\docmdi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\docview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynarray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\dynlib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\effects.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\encconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\event.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fddlgcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ffile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fileconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filefn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filename.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\filesys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fontcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fontmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\framecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_inet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_mem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\fs_zip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ftp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\gaugecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\gdicmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\geometry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\gifdecod.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\hash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\helpbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\http.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagall.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\image.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imaggif.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagjpeg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpcx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpnm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagtiff.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagxpm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\intl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ipcbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\layout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\lboxcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\log.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\longlong.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\matrix.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\memory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\menucmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mimecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\mstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\nbkbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\object.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\objstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\odbc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\paper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\popupcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\prntbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\process.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\protocol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\quantize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\radiocmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\regex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\resource.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckaddr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckipc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sckstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\serbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\socket.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\strconv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\stream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\string.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\sysopt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\tbarbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\textcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\textfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\timercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\tokenzr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\toplvcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\treebase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\url.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\utilscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\valgen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\validate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\valtext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\variant.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wfstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wincmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wxchar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\wxexpr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\xpmdecod.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zipstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\common\y_tab.c
-# ADD CPP /W1 /D "USE_DEFINE"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "Generic Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\generic\accel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\calctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\choicdgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\colrdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\dirdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\fdrepdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\filedlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\fontdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\grid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\gridctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\gridsel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\helpext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\helphtml.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\helpwxht.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\laywin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\listctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\msgdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\panelg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\printps.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\prntdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\prop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\propform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\proplist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\sashwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\splash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\statusbr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\tabg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\tipdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\tipwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\treectlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\treelay.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\wizard.cpp
-# End Source File
-
-# End Group
-# Begin Group "wxHTML Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\html\helpctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\helpdata.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\helpfrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlcell.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlfilt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlpars.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmltag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_dflist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_fonts.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_hline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_image.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_layout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_links.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_meta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_pre.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_tables.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\winpars.cpp
-# End Source File
-
-# End Group
-# Begin Group "MSW Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\app.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\bitmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\cursor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dcclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dcprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dde.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fontenum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fontutil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\frame.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\imaglist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\regconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\region.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\snglinst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\thread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\timer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\toplevel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\utilsexc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\window.cpp
-# End Source File
-
-# Begin Source File
-
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-
-# End Group
-# Begin Group "Universal Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\univ\bmpbuttn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\button.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\checkbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\checklst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\colschem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\combobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\control.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\dialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\framuniv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\gauge.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\inpcons.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\inphand.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\listbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\menu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\notebook.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\radiobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\radiobut.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\renderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\scrarrow.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\scrolbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\scrthumb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\slider.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\spinbutt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\statbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\statbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\statline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\stattext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\textctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\theme.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\topluniv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\winuniv.cpp
-# End Source File
-
-# Begin Group "Theme Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\univ\themes\gtk.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\themes\win32.cpp
-# End Source File
-
-# End Group
-# End Group
-# Begin Group "Headers"
-
-# PROP Default_Filter ""
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\univ\setup.h
-!IF  "$(CFG)" == "wxuniv - Win32 Release"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\univ\setup.h
-
-"../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\univ\wx\setup.h
-
-# End Custom Build
-!ELSEIF  "$(CFG)" == "wxuniv - Win32 Debug"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\univ\setup.h
-
-"../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\lib\univd\wx\setup.h
-
-# End Custom Build
-!ENDIF 
-# End Source File
-# End Group
-# Begin Group "Common"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\accel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\app.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\bitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\bmpbuttn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\brush.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\buffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\busyinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\button.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\calctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\caret.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\checkbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\checklst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\choicdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\choice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\clipbrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cmdline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cmndata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\colordlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\colour.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\combobox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\confbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\containr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cshelp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ctrlsub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\cursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datetime.inl
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\datstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\db.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbgrid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbkeyg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dbtable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dcclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dcmemory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dcprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dcps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dcscreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dialup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dir.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dirdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\docmdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\docview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dragimag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\dynlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\encconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\expr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fdrepdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ffile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fileconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filedlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filefn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filename.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\filesys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontenum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fontutil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_inet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_mem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\fs_zip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gauge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gdicmn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gdiobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\geometry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gifdecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\glcanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gsocket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\help.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\helpbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\helphtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\helpwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\icon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imaggif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imaglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagpcx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagpng.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagpnm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagtiff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\imagxpm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\intl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ioswrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ipcbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\isql.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\isqlext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\joystick.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\layout.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\laywin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\listbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\log.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\longlong.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\menuitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\metafile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mimetype.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\minifram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\module.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\mstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\objstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\odbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\ownerdrw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\palette.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\panel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\paper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\pen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\popupwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\print.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\printdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\prntbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\progdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\prop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\propform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\proplist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\radiobox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\radiobut.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckaddr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckipc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sckstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\scrolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\scrolwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\serbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\settings.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\slider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\snglinst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\spinbutt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\spinctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\splash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\statbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\statbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\statline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\stattext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\statusbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\strconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\sysopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tabctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\taskbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tbarbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\textctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\textdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\textfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\thread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tipdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tipwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tokenzr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\toolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\tooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\toplevel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\treebase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\treectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\txtstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\url.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\utils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\valgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\validate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\valtext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\variant.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wave.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wfstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wizard.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx_cw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx_cw_cm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wx_cw_d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxexpr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxhtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxprec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\xpmdecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zipstrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\zstream.h
-# End Source File
-
-# End Group
-# Begin Group "MSW"
-
-# PROP Default_Filter ""
-# End Group
-# Begin Group "Generic"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\generic\accel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\calctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\caret.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\choicdgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\colrdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\dcpsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\dirctrlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\dirdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\dragimgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\fdrepdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\filedlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\fontdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\gridctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\gridg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\helpext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\helphtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\helpwxht.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\imaglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\laywin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\msgdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\paletteg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\panelg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\printps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\prntdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\progdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\scrolwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\splash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\statusbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\tabg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\textdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\treectlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\wizard.h
-# End Source File
-
-# End Group
-# Begin Group "HTML"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\html\forcelnk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\helpctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\helpdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\helpfrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmlcell.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmldefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmlfilt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmlpars.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmltag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmlwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\htmprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\m_templ.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\html\winpars.h
-# End Source File
-
-# End Group
-# Begin Group "Universal"
-
-# PROP Default_Filter ""
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/src/wxuniv.dsw b/src/wxuniv.dsw
deleted file mode 100644
index c03ae3767c..0000000000
--- a/src/wxuniv.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxuniv"=.\wxuniv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-