From 0797afee6071db08b8bce7d40b8e2cd09a1da2a1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 30 Sep 2001 22:22:58 +0000
Subject: [PATCH] updated templates for creation of VC++ 6.0 project files for
 wxBase/wxMSW/wxUniv static and DLL builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.txt |   60 +-
 distrib/msw/tmake/vc6app.t     |  110 +-
 distrib/msw/tmake/vc6base.t    |  105 +-
 distrib/msw/tmake/vc6bdll.t    |  117 +-
 distrib/msw/tmake/vc6dll.t     |  175 ++-
 distrib/msw/tmake/vc6lib.t     |   47 +-
 src/wxvc.dsp                   | 1231 ----------------
 src/wxvc.dsw                   |  104 --
 src/wxvc_dll.dsp               | 2424 --------------------------------
 src/wxvc_dll.dsw               |   29 -
 src/wxvc_universal.dsp         | 1396 ------------------
 src/wxvc_universal.dsw         |   89 --
 12 files changed, 438 insertions(+), 5449 deletions(-)
 delete mode 100644 src/wxvc.dsp
 delete mode 100644 src/wxvc.dsw
 delete mode 100644 src/wxvc_dll.dsp
 delete mode 100644 src/wxvc_dll.dsw
 delete mode 100644 src/wxvc_universal.dsp
 delete mode 100644 src/wxvc_universal.dsw

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index f1f0bbcf29..ae62c8303f 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -49,6 +49,7 @@
 #  NotX	Not required for the Motif port
 #  NotOS2	Not required for the os2Pm port
 #  LowLevel	Low level GUI toolkit file, used by wxUniversal as well
+#  Theme        implements a wxUniv theme
 ###############################################################################
 
 # File name 	Type	Flags
@@ -228,34 +229,34 @@ zstream.cpp	Common	Base
 gsocket.c	MSW	Socket,Base
 gsockmsw.c	MSW	Socket,Base
 accel.cpp	MSW
-app.cpp	MSW
+app.cpp	MSW	LowLevel
 automtn.cpp	MSW	OLE
-bitmap.cpp	MSW
+bitmap.cpp	MSW	LowLevel
 bmpbuttn.cpp	MSW
-brush.cpp	MSW
+brush.cpp	MSW	LowLevel
 button.cpp	MSW
-caret.cpp	MSW
+caret.cpp	MSW	LowLevel
 checkbox.cpp	MSW
 checklst.cpp	MSW
 choice.cpp	MSW
-clipbrd.cpp	MSW
+clipbrd.cpp	MSW	LowLevel
 colordlg.cpp	MSW
-colour.cpp	MSW
+colour.cpp	MSW	LowLevel
 combobox.cpp	MSW
 control.cpp	MSW
 curico.cpp	MSW
-cursor.cpp	MSW
-data.cpp	MSW
+cursor.cpp	MSW	LowLevel
+data.cpp	MSW	LowLevel
 dataobj.cpp	MSW	OLE
-dc.cpp	MSW
-dcclient.cpp	MSW
-dcmemory.cpp	MSW
-dcprint.cpp	MSW
-dcscreen.cpp	MSW
+dc.cpp	MSW	LowLevel
+dcclient.cpp	MSW	LowLevel
+dcmemory.cpp	MSW	LowLevel
+dcprint.cpp	MSW	LowLevel
+dcscreen.cpp	MSW	LowLevel
 dde.cpp	MSW	Base
 dialog.cpp	MSW
 dialup.cpp	MSW
-dib.cpp	MSW
+dib.cpp	MSW	LowLevel
 dibutils.cpp	MSW
 dir.cpp	MSW	Base
 dirdlg.cpp	MSW	Win32Only
@@ -267,25 +268,25 @@ helpbest.cpp	MSW	Win32Only
 evtloop.cpp	MSW	LowLevel
 fdrepdlg.cpp	MSW	Win32Only
 filedlg.cpp	MSW
-font.cpp	MSW
+font.cpp	MSW	LowLevel
 fontdlg.cpp	MSW
-fontenum.cpp	MSW
-fontutil.cpp	MSW
+fontenum.cpp	MSW	LowLevel
+fontutil.cpp	MSW	LowLevel
 frame.cpp	MSW
 gauge95.cpp	MSW	Win32Only
 gaugemsw.cpp	MSW	NotWin32
-gdiimage.cpp	MSW
-gdiobj.cpp	MSW
+gdiimage.cpp	MSW	LowLevel
+gdiobj.cpp	MSW	LowLevel
 glcanvas.cpp	MSW
 helpchm.cpp	MSW	Win32Only
 helpwin.cpp	MSW
-icon.cpp	MSW
+icon.cpp	MSW	LowLevel
 imaglist.cpp	MSW	Win32Only,LowLevel
 iniconf.cpp	MSW	NotWin32
 joystick.cpp	MSW
 listbox.cpp	MSW
 listctrl.cpp	MSW	Win32Only
-main.cpp	MSW	Base
+main.cpp	MSW	LowLevel,Base
 mdi.cpp	MSW
 menu.cpp	MSW
 menuitem.cpp	MSW
@@ -297,18 +298,18 @@ nativdlg.cpp	MSW
 notebook.cpp	MSW	Win32Only
 oleutils.cpp	MSW	OLE
 ownerdrw.cpp	MSW
-palette.cpp	MSW
-pen.cpp	MSW
+palette.cpp	MSW	LowLevel
+pen.cpp	MSW	LowLevel
 penwin.cpp	MSW
 printdlg.cpp	MSW
 printwin.cpp	MSW
 radiobox.cpp	MSW
 radiobut.cpp	MSW
 regconf.cpp	MSW	Win32Only,Base
-region.cpp	MSW
+region.cpp	MSW	LowLevel
 registry.cpp	MSW	Win32Only,Base
 scrolbar.cpp	MSW
-settings.cpp	MSW
+settings.cpp	MSW	LowLevel
 slider95.cpp	MSW	Win32Only
 slidrmsw.cpp	MSW	NotWin32
 snglinst.cpp	MSW	Base
@@ -326,7 +327,7 @@ tbarmsw.cpp	MSW	NotWin32
 textctrl.cpp	MSW
 tglbtn.cpp	MSW
 thread.cpp	MSW	Win32Only,Base
-timer.cpp	MSW
+timer.cpp	MSW	LowLevel
 tooltip.cpp	MSW	Win32Only
 toplevel.cpp	MSW	LowLevel
 treectrl.cpp	MSW	Win32Only
@@ -334,7 +335,7 @@ utils.cpp	MSW	Base
 utilsexc.cpp	MSW	Base
 uuid.cpp	MSW	OLE
 wave.cpp	MSW
-window.cpp	MSW
+window.cpp	MSW	LowLevel
 
 dialup.cpp	Unix
 dir.cpp	Unix	Base
@@ -352,6 +353,7 @@ button.cpp	Univ
 checkbox.cpp	Univ
 checklst.cpp	Univ
 colschem.cpp	Univ
+combobox.cpp	Univ
 control.cpp	Univ
 dialog.cpp	Univ
 framuniv.cpp	Univ
@@ -376,9 +378,9 @@ statline.cpp	Univ
 stattext.cpp	Univ
 textctrl.cpp	Univ
 theme.cpp	Univ
-gtk.cpp	Univ
+gtk.cpp	Univ	Theme
 winuniv.cpp	Univ
-win32.cpp	Univ
+win32.cpp	Univ	Theme
 
 gsockgtk.c	GTK	LowLevel
 win_gtk.c	GTK	LowLevel
diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index 5330f04965..6826836cb1 100644
--- a/distrib/msw/tmake/vc6app.t
+++ b/distrib/msw/tmake/vc6app.t
@@ -1,17 +1,24 @@
 #!#############################################################################
-#! File:    vc6lib.t
+#! File:    vc6app.t
 #! Purpose: tmake template file from which the VC++ 6.0 project file for
-#!          building static wxWindows library wxvc.dsp is generated by running
+#!          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
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
 #! Version: $Id$
 #!#############################################################################
 #${
+    #! what kind of app are we building - this is used as prefix for the build
+    #! output dir
+    $KIND="";
+
     if ( Config("wx") ) {
 	Project('CONFIG += windows');
     }
-    if ( Config("wxbase") ) {
+    if ( Config("wxbase") || Config("wxuniv") ) {
 	Project('CONFIG += wx');
     }
     if ( Config("wx") ) {
@@ -46,23 +53,37 @@
 	$UNICODE_FLAGS=" ";
     }
 
-    if ( Config("dll") ) {
-	$DLL="Dll";
-	$DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "232";
-	$DLL_FLAGS="/D WXUSINGDLL ";
-	$EXTRA_LIBS="";
+    if ( Config("wx") ) {
+	if ( Config("wxbase") ) {
+	    $KIND="Base";
+	    $DLL_OR_LIB="wxbase";
+       	}
+	elsif ( Config("wxuniv") ) {
+	    $KIND="Univ";
+	    $DLL_OR_LIB="wxuniv";
+	}
+	else {
+	    $DLL_OR_LIB="wxmsw"
+	}
 
-	$project{"TARGET"} .= "Dll";
-	$project{"MAKEFILE"} .= "Dll";
-    }
-    else {
-	$DLL="";
-	$DLL_OR_LIB=Config("wxbase") ? "wxbase" : "wxmsw";
-	$DLL_FLAGS=" ";
-	#! actually this should depend on the contents of setup.h!
-	$EXTRA_LIBS="zlib regex";
-	if ( !Config("wxbase") ) {
-	    $EXTRA_LIBS.=" png jpeg tiff";
+	if ( Config("dll") ) {
+	    $DLL="Dll";
+
+	    $DLL_OR_LIB .= "232";
+	    $DLL_FLAGS="/D WXUSINGDLL ";
+	    $EXTRA_LIBS="";
+
+	    $project{"TARGET"} .= "Dll";
+	    $project{"MAKEFILE"} .= "Dll";
+	}
+	else {
+	    $DLL="";
+	    $DLL_FLAGS=" ";
+	    #! actually this should depend on the contents of setup.h!
+	    $EXTRA_LIBS="zlib regex";
+	    if ( !Config("wxbase") ) {
+		$EXTRA_LIBS.=" png jpeg tiff";
+	    }
 	}
     }
 
@@ -107,6 +128,10 @@
 	    $vc_base_libs .= 'wsock32.lib ';
 	    $vc_link_release = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
 	    $vc_link_debug = "$WXDIR\\lib\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
+	    foreach ( split(/ /, $EXTRA_LIBS) ) {
+		$vc_link_release .= "$WXDIR\\lib\\$_.lib ";
+		$vc_link_debug .= "$WXDIR\\lib\\$_" . "d.lib ";
+	    }
 	}
 	$vc_link_release .= '/nologo /subsystem:console /machine:I386';
 	$vc_link_debug   .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';
@@ -135,7 +160,7 @@
 
     $vc_cpp_opt_common1 = '/nologo /W4 ';
 
-    $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O1 ';
+    $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O2 ';
     $vc_cpp_opt_debug   = $vc_cpp_opt_common1 . '/Zi /Od ';
     $vc_cpp_opt_common  = '/YX /FD /c';
     $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
@@ -146,19 +171,36 @@
     if ( $text ne "" ) { $vc_def = $text . " ";  $text = ""; } else { $vc_def = ""; }
     if ( Config("wx") ) {
 	#! define wxWindows compilation flags
-	$vc_def .= '/D _WIN32 /D WINVER=0x400 /D _MT ';
+	$vc_def .= '/D WIN32 /D WINVER=0x400 /D _MT ';
 
 	if ( Config("wxbase") ) {
 	    $vc_def .= '/D wxUSE_GUI=0 ';
+	    $vc_inc_debug .= "/I$WXDIR\\lib\\based ";
+	    $vc_inc_release .= "/I$WXDIR\\lib\\base ";
 	}
 	else {
 	    $vc_def .= '/D wxUSE_GUI=1 ';
+
+	    if ( Config("wxuniv") ) {
+		$vc_def .= '/D "__WXUNIVERSAL__" ';
+
+		$vc_inc_debug .= "/I$WXDIR\\lib\\univd ";
+		$vc_inc_release .= "/I$WXDIR\\lib\\univ ";
+	    }
+	    else {
+		$vc_inc_debug .= "/I$WXDIR\\lib\\mswd ";
+		$vc_inc_release .= "/I$WXDIR\\lib\\msw ";
+	    }
 	}
     }
+    else {
+	$vc_inc_debug =
+	$vc_inc_release = "";
+    }
 
     $project{"VC_CPP_INCLUDE"} = $vc_inc;
-    $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common;
-    $project{"VC_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_inc . $vc_cpp_def_debug   . $vc_def . $vc_cpp_opt_common;
+    $project{"VC_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_inc . $vc_inc_release . $vc_cpp_def_release . $vc_def . $vc_cpp_opt_common;
+    $project{"VC_CPP_DEBUG"}   = $vc_cpp_opt_debug   . $vc_inc . $vc_inc_debug . $vc_cpp_def_debug   . $vc_def . $vc_cpp_opt_common;
 
     if ( Project('RES_FILE') ) {
 	tmake_error(".res files are not supported, use .rc.");
@@ -183,12 +225,6 @@
     @files = split(/\s+/,$project{"RC_FILE"});
     foreach ( @files ) { $all_files{$_} = "r" };
 
-    if ( $moc_aware ) {
-        @files = split(/\s+/,$project{"_HDRMOC"});
-	foreach ( @files ) { $all_files{$_} = "m"; }
-	@files = split(/\s+/,$project{"_SRCMOC"});
-	foreach ( @files ) { $all_files{$_} = "i"; }
-    }
     %file_names = ();
     foreach $f ( %all_files ) {
 	$n = $f;
@@ -233,13 +269,13 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
-# PROP BASE Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
+# PROP BASE Output_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
-# PROP Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
+# PROP Output_Dir #$ $text = "\"${KIND}Release$UNICODE$DLL\""
+# PROP Intermediate_Dir #$ $text = "${KIND}Release$UNICODE$DLL\""
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
@@ -261,13 +297,13 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
-# PROP BASE Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
+# PROP BASE Output_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
+# PROP BASE Intermediate_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
-# PROP Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
+# PROP Output_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
+# PROP Intermediate_Dir #$ $text = "\"${KIND}Debug$UNICODE$DLL\""
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t
index 3a0b5b4e4e..5fc0afc6a1 100644
--- a/distrib/msw/tmake/vc6base.t
+++ b/distrib/msw/tmake/vc6base.t
@@ -30,6 +30,19 @@
         my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
         $project{$tag} .= $file . " "
     }
+
+    foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} !~ /\bB\b/;
+        next if $file =~ /setup.h/;
+        next if $file =~ /[^.]*.cpp$/;
+        $project{"WXHEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSWINCLUDE) {
+        next if $wxMSWINCLUDE{$file} !~ /\bB\b/;
+        next if $file =~ /setup0?.h/;
+        $project{"WXMSWHEADERS"} .= $file . " "
+    }
 #$}
 # Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -65,16 +78,16 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "lib"
-# PROP BASE Intermediate_Dir "src/msw/BaseRelease"
+# 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 "src/msw/BaseRelease"
+# PROP Output_Dir "..\lib"
+# PROP Intermediate_Dir "..\BaseRelease"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(WXWIN)\include" /I "$(WXWIN)\src\regex" /I "$(WXWIN)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
+# 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
@@ -82,30 +95,30 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"lib\wxBase.lib"
+# 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 "src/msw/BaseDebug"
+# 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 "src/msw/BaseDebug"
+# PROP Output_Dir "..\lib"
+# PROP Intermediate_Dir "..\BaseDebug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(WXWIN)\include" /I "$(WXWIN)\src\regex" /I "$(WXWIN)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c
+# 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"
+# ADD BSC32 /nologo /o"../lib/wxbase.bsc"
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"lib\wxBased.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxbased.lib"
 
 !ENDIF 
 
@@ -114,16 +127,68 @@ LIB32=link.exe -lib
 # Name "wxBase - Win32 Release"
 # Name "wxBase - 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");
+# End Group
+# Begin Group "MSW Files"
+
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\msw\dummy.cpp
+SOURCE=.\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
-#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
-#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
-#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ 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 "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 ""
+#$ 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
+# End Group
 # End Target
 # End Project
+#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:
diff --git a/distrib/msw/tmake/vc6bdll.t b/distrib/msw/tmake/vc6bdll.t
index 657fb8c35a..ac75de0d14 100644
--- a/distrib/msw/tmake/vc6bdll.t
+++ b/distrib/msw/tmake/vc6bdll.t
@@ -30,6 +30,21 @@
         my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
         $project{$tag} .= $file . " "
     }
+
+    foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} !~ /\bB\b/;
+        next if $file =~ /setup.h/;
+        next if $file =~ /[^.]*.cpp$/;
+        $project{"WXHEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSWINCLUDE) {
+        next if $wxMSWINCLUDE{$file} !~ /\bB\b/;
+        next if $file =~ /setup0?.h/;
+        $project{"WXMSWHEADERS"} .= $file . " "
+    }
+
+    $project{"WXVERSION"} = "232";
 #$}
 # Microsoft Developer Studio Project File - Name="wxBaseDll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -66,53 +81,53 @@ RSC=rc.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# 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 "BaseDllRelease"
-# PROP Intermediate_Dir "BaseDllRelease"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../BaseDllRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /O2 /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# 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 "$(wx)\include" /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:"BaseDllRelease/wxbase221.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll"
+# 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/wxbase#$ $text = $project{"WXVERSION"} . '.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/wxbase#$ $text = $project{"WXVERSION"} . '.dll"'
 
 !ELSEIF  "$(CFG)" == "wxBaseDll - 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 Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../BaseDllDebug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "BaseDllDebug"
-# PROP Intermediate_Dir "BaseDllDebug"
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../BaseDllDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c
+# 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 "$(wx)\include" /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:"BaseDllDebug/wxbase221d.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll"
+# 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/wxbase#$ $text = $project{"WXVERSION"} . 'd.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/wxbase#$ $text = $project{"WXVERSION"} . 'd.dll"'
 
 !ENDIF 
 
@@ -122,16 +137,70 @@ LINK32=link.exe
 # Name "wxBaseDll - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\src\common\base.rc
+SOURCE=.\common\base.rc
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\msw\dummydll.cpp
+SOURCE=.\msw\dummydll.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
-#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
-#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
-#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+# 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");
+# End Group
+# Begin Group "MSW Files"
+
+# PROP Default_Filter ""
+#$ 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 "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 ""
+#$ 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
+# End Group
 # End Target
 # End Project
+#! vi: set sta ts=8 sw=4 noet nolist tw=0 ft=make:
diff --git a/distrib/msw/tmake/vc6dll.t b/distrib/msw/tmake/vc6dll.t
index fc6fc93195..eebcd376a2 100644
--- a/distrib/msw/tmake/vc6dll.t
+++ b/distrib/msw/tmake/vc6dll.t
@@ -1,7 +1,7 @@
 #!#############################################################################
 #! File:    vc6dll.t
-#! Purpose: tmake template file from which wxWinDll.dsp is generated by running
-#!          tmake -t vc6dll wxwin.pro -o wxWinDll.dsp
+#! Purpose: tmake template file from which wxdll.dsp is generated by running
+#!          tmake -t vc6dll wxwin.pro -o wxdll.dsp
 #! Author:  Vadim Zeitlin
 #! Created: 13.10.99
 #! Version: $Id$
@@ -37,28 +37,50 @@
         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 . " "
+    }
+
+    $project{"WXVERSION"} = "232";
 #$}
-# Microsoft Developer Studio Project File - Name="wxWinDll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wxdll" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=wxWinDll - Win32 Debug
+CFG=wxdll - 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 "wxWinDll.mak".
+!MESSAGE NMAKE /f "wxdll.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 "wxWinDll.mak" CFG="wxWinDll - Win32 Debug"
+!MESSAGE NMAKE /f "wxdll.mak" CFG="wxdll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wxWinDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxWinDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -69,99 +91,160 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+!IF  "$(CFG)" == "wxdll - 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 Output_Dir "../lib"
+# 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 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 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /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 "$(wx)\include" /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 src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\regex\Release\regex.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.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 src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\regex\Release\regex.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
+# 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)" == "wxWinDll - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxdll - 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 Output_Dir "../lib"
+# 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 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 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\regex" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /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 "$(wx)\include" /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 src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\regex\Debug\regex.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.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 src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\regex\Debug\regex.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
+# 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"'
 
 !ENDIF 
 
 # Begin Target
 
-# Name "wxWinDll - Win32 Release"
-# Name "wxWinDll - Win32 Debug"
+# Name "wxdll - Win32 Release"
+# Name "wxdll - 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=.\src\msw\dummydll.cpp
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=.\common\y_tab.c
+# ADD CPP /W1 /D "USE_DEFINE"
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
-#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
-#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n");
-#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
-#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
-#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
-#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");
+# 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=.\src\msw\version.rc
+SOURCE=.\msw\dummydll.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 "Resources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\common\y_tab.c
+SOURCE=.\msw\version.rc
+# End Source File
+# End Group
+# Begin Group "Headers"
 
-!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+# PROP Default_Filter ""
+# Begin Group "Setup"
 
-# ADD CPP /W1
-# SUBTRACT CPP /YX /Yc /Yu
+# PROP Default_Filter ""
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"
+SOURCE=..\include\wx\msw\setup0.h
+!IF  "$(CFG)" == "wxdll - Win32 Release"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
 
-# ADD CPP /W1
-# SUBTRACT CPP /YX /Yc /Yu
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\mswdll\wx\setup.h
 
-!ENDIF 
+# End Custom Build
+!ELSEIF  "$(CFG)" == "wxdll - Win32 Debug"
+# 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
+!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=make:
diff --git a/distrib/msw/tmake/vc6lib.t b/distrib/msw/tmake/vc6lib.t
index 37e10b9c92..13a977a461 100644
--- a/distrib/msw/tmake/vc6lib.t
+++ b/distrib/msw/tmake/vc6lib.t
@@ -1,8 +1,8 @@
 #!#############################################################################
 #! File:    vc6lib.t
 #! Purpose: tmake template file from which the VC++ 6.0 project file for
-#!          building static wxWindows library wxvc.dsp is generated by running
-#!                  tmake -t vc6lib wxwin.pro -o wxvc.dsp
+#!          building static wxWindows library wx.dsp is generated by running
+#!                  tmake -t vc6lib wxwin.pro -o wx.dsp
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
 #! Version: $Id$
@@ -59,37 +59,37 @@
         $project{"WXHTMLHEADERS"} .= $file . " "
     }
 #$}
-# Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wx" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=wxvc - Win32 Debug
+CFG=wx - 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 "wxvc.mak".
+!MESSAGE NMAKE /f "wx.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 "wxvc.mak" CFG="wxvc - Win32 Debug"
+!MESSAGE NMAKE /f "wx.mak" CFG="wx - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wxvc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxvc - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wx - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wx - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wxvc"
+# PROP Scc_ProjName "wx"
 # PROP Scc_LocalPath ".."
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "wxvc - Win32 Release"
+!IF  "$(CFG)" == "wx - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -102,7 +102,7 @@ RSC=rc.exe
 # 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 "../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 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
@@ -112,7 +112,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wx - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -125,7 +125,7 @@ LIB32=link.exe -lib
 # 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 "../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 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
@@ -139,8 +139,8 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "wxvc - Win32 Release"
-# Name "wxvc - Win32 Debug"
+# Name "wx - Win32 Release"
+# Name "wx - Win32 Debug"
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -172,6 +172,7 @@ 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"
 
@@ -187,17 +188,23 @@ SOURCE=.\msw\dummy.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\msw\setup0.h
+!IF  "$(CFG)" == "wx - Win32 Release"
 # Begin Custom Build - Creating wx/setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup0.h
 
-"../include/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) ..\include\wx\setup.h
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\lib\msw\wx\setup.h
 
 # End Custom Build
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "wx - Win32 Debug"
+# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup0.h
 
-SOURCE=..\include\wx\setup.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"
diff --git a/src/wxvc.dsp b/src/wxvc.dsp
deleted file mode 100644
index 67cb32c65c..0000000000
--- a/src/wxvc.dsp
+++ /dev/null
@@ -1,1231 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxvc - 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 "wxvc.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 "wxvc.mak" CFG="wxvc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxvc - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxvc - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wxvc"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxvc - 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 "msw/Release"
-# PROP Intermediate_Dir "msw/Release"
-# 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" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wx.lib"
-
-!ELSEIF  "$(CFG)" == "wxvc - 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 "msw/Debug"
-# PROP Intermediate_Dir "msw/Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\wxd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxvc - Win32 Release"
-# Name "wxvc - 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\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\dosyacc.c
-# ADD CPP /D "USE_DEFINE" /D "YY_USE_PROTOS" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
-# 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\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\ftp.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
-# ADD CPP /I "../src/jpeg"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpcx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpng.cpp
-# ADD CPP /I "png" /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpnm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagtiff.cpp
-# ADD CPP /I "tiff" /I "zlib"
-# 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\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
-# ADD CPP /I "regex"
-# 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\treebase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Generic Files"
-
-# PROP Default_Filter ""
-# 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\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\dragimgg.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\logg.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\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\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\accel.cpp
-# 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\bmpbuttn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\button.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\checkbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\checklst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\choice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\colordlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\combobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\control.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\curico.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\dialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dibutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dragimag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fdrepdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\filedlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fontdlg.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\gauge95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gaugemsw.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\glcanvas.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
-# Begin Source File
-
-SOURCE=.\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\helpwin.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\iniconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\joystick.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\listbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\listctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mdi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\menu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\menuitem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\metafile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\msgdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\nativdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\notebook.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ownerdrw.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\penwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\radiobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\radiobut.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\scrolbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\slider95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\slidrmsw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\snglinst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\spinbutt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\spinctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbr95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\stattext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tabctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\taskbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tbar95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\textctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tglbtn.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\tooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\treectrl.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\wave.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
-# End Source File
-# End Group
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\setup.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/wxvc.dsw b/src/wxvc.dsw
deleted file mode 100644
index 8bcc09e747..0000000000
--- a/src/wxvc.dsw
+++ /dev/null
@@ -1,104 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "jpeg"=.\jpeg\JpegVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "png"=.\png\PngVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "regex"=.\regex\RegexVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tiff"=.\tiff\TiffVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxvc"=.\wxvc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name png
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name jpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name tiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name regex
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
deleted file mode 100644
index 54f4fac531..0000000000
--- a/src/wxvc_dll.dsp
+++ /dev/null
@@ -1,2424 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxvc_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=wxvc_dll - 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 "wxvc_dll.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 "wxvc_dll.mak" CFG="wxvc_dll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "wxvc_dll - 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)" == "wxvc_dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxvc_dll"
-# PROP BASE Intermediate_Dir "wxvc_dll"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "msw/ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx23_2.dll"
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "wxvc_dl0"
-# PROP BASE Intermediate_Dir "wxvc_dl0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../lib"
-# PROP Intermediate_Dir "msw/DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\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 WXMAKINGDLL=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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx23_2d.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxvc_dll - Win32 Release"
-# Name "wxvc_dll - 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\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\dosyacc.c
-# ADD CPP /D "USE_DEFINE" /D "YY_USE_PROTOS" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
-# 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\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# 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
-# ADD CPP /I "../src/jpeg"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpcx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpng.cpp
-# ADD CPP /I "png" /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpnm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagtiff.cpp
-# ADD CPP /I "tiff" /I "zlib"
-# 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\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
-# ADD CPP /I "regex"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\resourc2.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\treebase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\txtstrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-# End Source File
-# End Group
-# Begin Group "Generic Files"
-
-# PROP Default_Filter ""
-# 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\dragimgg.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\logg.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\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\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\accel.cpp
-# 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\bmpbuttn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\button.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\checkbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\checklst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\choice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\colordlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\combobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\control.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\curico.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\dialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dibutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dragimag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fdrepdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\filedlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fontdlg.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\gauge95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\gaugemsw.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\glcanvas.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
-# Begin Source File
-
-SOURCE=.\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\helpwin.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\iniconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\joystick.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\listbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\listctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mdi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\menu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\menuitem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\metafile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\msgdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\nativdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\notebook.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ownerdrw.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\penwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\radiobox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\radiobut.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\scrolbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\slider95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\slidrmsw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\snglinst.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\spinbutt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\spinctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statbr95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\statline.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\stattext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tabctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\taskbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tbar95.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\textctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\tglbtn.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\tooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\treectrl.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\wave.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
-# End Source File
-# End Group
-# Begin Group "PNG Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\png\png.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngerror.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngget.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngmem.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngpread.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngread.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrio.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrtran.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrutil.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngset.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngtest.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngtrans.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwio.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwrite.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwtran.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwutil.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "Zlib Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zlib\adler32.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\compress.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\crc32.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\gzio.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infblock.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infcodes.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inflate.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infutil.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\uncompr.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\setup.h
-# End Source File
-# End Group
-# Begin Group "JPEG Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\jpeg\jcapimin.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcapistd.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jccoefct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jccolor.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcdctmgr.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jchuff.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcinit.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcmainct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcmarker.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcmaster.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcomapi.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcparam.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcphuff.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcprepct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jcsample.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jctrans.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdapimin.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdapistd.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdatadst.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdatasrc.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdcoefct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdcolor.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jddctmgr.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdhuff.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdinput.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdmainct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdmarker.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdmaster.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdmerge.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdphuff.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdpostct.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdsample.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jdtrans.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jerror.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jfdctflt.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jfdctfst.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jfdctint.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jidctflt.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jidctfst.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jidctint.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jidctred.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jmemmgr.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jmemnobs.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jquant1.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jquant2.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpeg\jutils.c
-
-!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
-
-# ADD CPP /I "..\include" /I ".."
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
-
-# ADD CPP /Zi /I ".."
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "TIFF files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\tiff\tif_aux.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_close.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_codec.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_compress.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_dir.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_dirinfo.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_dirread.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_dirwrite.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_dumpmode.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_error.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_fax3.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_fax3sm.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_flush.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_getimage.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_jpeg.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_luv.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_lzw.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_next.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_open.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_packbits.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_pixarlog.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_predict.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_print.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_read.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_strip.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_swab.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_thunder.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_tile.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_version.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_warning.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_win32.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_write.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\tiff\tif_zip.c
-# ADD CPP /I "tiff"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# Begin Group "Regex Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\regex\regcomp.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex\regerror.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex\regexec.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex\regfree.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex\split.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/wxvc_dll.dsw b/src/wxvc_dll.dsw
deleted file mode 100644
index 5b54c6f9bd..0000000000
--- a/src/wxvc_dll.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: "wxvc_dll"=.\wxvc_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/wxvc_universal.dsp b/src/wxvc_universal.dsp
deleted file mode 100644
index 65d2a47f16..0000000000
--- a/src/wxvc_universal.dsp
+++ /dev/null
@@ -1,1396 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxvc_universal" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=wxvc_universal - 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 "wxvc_universal.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 "wxvc_universal.mak" CFG="wxvc_universal - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxvc_universal - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxvc_universal - 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)" == "wxvc_universal - 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 "msw/UnivRelease"
-# PROP Intermediate_Dir "msw/UnivRelease"
-# 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" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-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)" == "wxvc_universal - 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 "../UnivDebug"
-# PROP Intermediate_Dir "../UnivDebug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-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 "wxvc_universal - Win32 Release"
-# Name "wxvc_universal - 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\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\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# 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
-# ADD CPP /I "../src/jpeg"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpcx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpng.cpp
-# ADD CPP /I "png" /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagpnm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\imagtiff.cpp
-# ADD CPP /I "tiff" /I "zlib"
-# 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\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\unzip.c
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-# 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
-# ADD CPP /I "zlib"
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\zstream.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# SUBTRACT CPP /X
-
-!ENDIF 
-
-# 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\dirctrlg.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\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\imaglist.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\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
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\helpdata.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\helpfrm.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlcell.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlfilt.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlpars.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmltag.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmlwin.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\htmprint.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_dflist.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_fonts.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_hline.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_image.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_layout.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_links.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_list.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_meta.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_pre.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\m_tables.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\html\winpars.cpp
-
-!IF  "$(CFG)" == "wxvc_universal - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxvc_universal - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "MSW Files"
-
-# PROP Default_Filter ""
-# 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\curico.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\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dibutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dragimag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\filedlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\fontdlg.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\glcanvas.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
-# Begin Source File
-
-SOURCE=.\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\helpwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\iniconf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\joystick.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\metafile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\mimetype.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\minifram.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\penwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\printwin.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\taskbar.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\wave.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "Setup"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\univ\setup.h
-# End Source File
-# End Group
-# Begin Group "Univ 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\themes\gtk.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\themes\win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\winuniv.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/src/wxvc_universal.dsw b/src/wxvc_universal.dsw
deleted file mode 100644
index d96d0f1a7a..0000000000
--- a/src/wxvc_universal.dsw
+++ /dev/null
@@ -1,89 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "jpeg"=.\jpeg\JpegVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "png"=.\png\PngVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tiff"=.\tiff\TiffVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxvc_universal"=.\wxvc_universal.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name png
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name jpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name tiff
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zlib"=.\zlib\ZlibVC.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
-- 
2.45.2