post wxUniv merge fixes

[wxWidgets.git] / src / wxvc.dsp

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 3675e3241b191a8b54e0623c9597060e45642c80..763b35aeed311c3f75003688f25a89094795f569 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -1,7 +1,6 @@
 # Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>
 # Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **
 # ** DO NOT EDIT **

-# RCS-ID:      $Id$

 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 


@@ -23,9 +22,11 @@ CFG=wxvc - Win32 Debug
 !MESSAGE 
 
 # Begin Project
 !MESSAGE 
 
 # Begin Project

-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "wxvc"
+# PROP Scc_LocalPath ".."

 CPP=cl.exe
 CPP=cl.exe

+RSC=rc.exe

 
 !IF  "$(CFG)" == "wxvc - Win32 Release"
 
 
 !IF  "$(CFG)" == "wxvc - Win32 Release"
 


@@ -36,17 +37,19 @@ CPP=cl.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# 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
 # 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 "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /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
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wx.lib"

 
 !ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
 
 
 !ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
 


@@ -57,17 +60,19 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# 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
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Z7 /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" /Yu"wx/wxprec.h" /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
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxd.lib"

 
 !ENDIF 
 
 
 !ENDIF 
 


@@ -80,10 +85,26 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # 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\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\cmndata.cpp
 # End Source File
 # Begin Source File


@@ -92,11 +113,19 @@ SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
 
 # 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\ctrlcmn.cpp
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\date.cpp
+SOURCE=.\common\ctrlsub.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\datetime.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -108,6 +137,10 @@ SOURCE=.\common\db.cpp
 # End Source File
 # Begin Source File
 
 # 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\dbtable.cpp
 # End Source File
 # Begin Source File


@@ -116,10 +149,18 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\docmdi.cpp
 # End Source File
 # Begin Source File


@@ -142,6 +183,14 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # 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\event.cpp
 # End Source File
 # Begin Source File


@@ -167,10 +216,22 @@ SOURCE=.\common\filefn.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\framecmn.cpp
 # End Source File
 # Begin Source File


@@ -179,7 +240,12 @@ SOURCE=.\common\fs_inet.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\fs_mem.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\fs_zip.cpp
 SOURCE=.\common\fs_zip.cpp

+# ADD CPP /I "zlib"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -191,6 +257,10 @@ SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
 
 # 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\gifdecod.cpp
 # End Source File
 # Begin Source File


@@ -207,6 +277,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
 # 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\imagbmp.cpp
 # End Source File
 # Begin Source File


@@ -224,11 +298,28 @@ SOURCE=.\common\imagjpeg.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\intl.cpp
 # End Source File
 # Begin Source File


@@ -241,6 +332,10 @@ SOURCE=.\common\layout.cpp
 # End Source File
 # Begin Source File
 
 # 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\list.cpp
 # End Source File
 # Begin Source File


@@ -261,7 +356,11 @@ SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\mimetype.cpp
+SOURCE=.\common\menucmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\mimecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -273,6 +372,10 @@ SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
 # 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\object.cpp
 # End Source File
 # Begin Source File


@@ -301,6 +404,19 @@ SOURCE=.\common\protocol.cpp
 # End Source File
 # Begin Source File
 
 # 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\resource.cpp
 # End Source File
 # Begin Source File


@@ -333,23 +449,23 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\stream.cpp
+SOURCE=.\common\strconv.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\string.cpp
+SOURCE=.\common\stream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\strconv.cpp
+SOURCE=.\common\string.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\tbarbase.cpp
+SOURCE=.\common\sysopt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\tbarsmpl.cpp
+SOURCE=.\common\tbarbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -361,15 +477,15 @@ SOURCE=.\common\textfile.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\time.cpp
+SOURCE=.\common\timercmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\timercmn.cpp
+SOURCE=.\common\tokenzr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\tokenzr.cpp
+SOURCE=.\common\treebase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -423,12 +539,25 @@ SOURCE=.\common\wxexpr.cpp
 # End Source File
 # Begin Source File
 
 # 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
 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"
 # End Source File
 # End Group
 # Begin Group "Generic Files"


@@ -440,11 +569,39 @@ SOURCE=.\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
 # 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\choicdgg.cpp
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\gridg.cpp
+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
 
 # End Source File
 # Begin Source File
 


@@ -456,6 +613,10 @@ SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
 # 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\numdlgg.cpp
 # End Source File
 # Begin Source File


@@ -484,7 +645,11 @@ SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\scrolwin.cpp
+SOURCE=.\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\splash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -500,6 +665,10 @@ SOURCE=.\generic\tabg.cpp
 # End Source File
 # Begin Source File
 
 # 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\textdlgg.cpp
 # End Source File
 # Begin Source File


@@ -508,6 +677,18 @@ SOURCE=.\generic\tipdlg.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\generic\wizard.cpp
 # End Source File
 # End Group


@@ -532,11 +713,11 @@ SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\htmlfilter.cpp
+SOURCE=.\html\htmlfilt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\htmlparser.cpp
+SOURCE=.\html\htmlpars.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -548,43 +729,51 @@ SOURCE=.\html\htmlwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\htmlwinparser.cpp
+SOURCE=.\html\htmprint.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_fonts.cpp
+SOURCE=.\html\m_dflist.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_hline.cpp
+SOURCE=.\html\m_fonts.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_image.cpp
+SOURCE=.\html\m_hline.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_layout.cpp
+SOURCE=.\html\m_image.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_links.cpp
+SOURCE=.\html\m_layout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_list.cpp
+SOURCE=.\html\m_links.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_pre.cpp
+SOURCE=.\html\m_list.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\mod_tables.cpp
+SOURCE=.\html\m_meta.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\search.cpp
+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"
 # End Source File
 # End Group
 # Begin Group "MSW Files"


@@ -616,6 +805,10 @@ SOURCE=.\msw\button.cpp
 # End Source File
 # Begin Source File
 
 # 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\checkbox.cpp
 # End Source File
 # Begin Source File


@@ -688,6 +881,10 @@ SOURCE=.\msw\dialog.cpp
 # End Source File
 # Begin Source File
 
 # 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\dib.cpp
 # End Source File
 # Begin Source File


@@ -696,6 +893,10 @@ SOURCE=.\msw\dibutils.cpp
 # End Source File
 # Begin Source File
 
 # 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\dirdlg.cpp
 # End Source File
 # Begin Source File


@@ -709,6 +910,10 @@ SOURCE=.\msw\dummy.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\filedlg.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\filedlg.cpp
 # End Source File
 # Begin Source File


@@ -721,6 +926,14 @@ SOURCE=.\msw\fontdlg.cpp
 # End Source File
 # Begin Source File
 
 # 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\frame.cpp
 # End Source File
 # Begin Source File


@@ -733,10 +946,32 @@ SOURCE=.\msw\gaugemsw.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\helpwin.cpp
 # End Source File
 # Begin Source File


@@ -785,6 +1020,10 @@ SOURCE=.\msw\metafile.cpp
 # End Source File
 # Begin Source File
 
 # 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\minifram.cpp
 # End Source File
 # Begin Source File


@@ -817,21 +1056,6 @@ SOURCE=.\msw\penwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\pnghand.cpp
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "png" /I "zlib"
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib" /I "png"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-

 SOURCE=.\msw\printdlg.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\printdlg.cpp
 # End Source File
 # Begin Source File


@@ -876,10 +1100,18 @@ SOURCE=.\msw\slidrmsw.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\statbmp.cpp
 # End Source File
 # Begin Source File


@@ -892,11 +1124,11 @@ SOURCE=.\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\stattext.cpp
+SOURCE=.\msw\statline.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\statline.cpp
+SOURCE=.\msw\stattext.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -912,11 +1144,11 @@ SOURCE=.\msw\tbar95.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\tbarmsw.cpp
+SOURCE=.\msw\textctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\textctrl.cpp
+SOURCE=.\msw\tglbtn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -950,11 +1182,6 @@ SOURCE=.\msw\wave.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
 
 SOURCE=.\msw\window.cpp
 # End Source File

-# Begin Source File
-
-SOURCE=.\msw\xpmhand.cpp
-# ADD CPP /I "../src/xpm"
-# End Source File

 # End Group
 # Begin Group "OLE Files"
 
 # End Group
 # Begin Group "OLE Files"
 


@@ -984,490 +1211,41 @@ SOURCE=.\msw\ole\oleutils.cpp
 SOURCE=.\msw\ole\uuid.cpp
 # End Source File
 # End Group
 SOURCE=.\msw\ole\uuid.cpp
 # End Source File
 # End Group

-# Begin Group "PNG Files"
+# Begin Group "Setup"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\png\png.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
+SOURCE=..\include\wx\msw\setup.h

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "Regex Files"

 
 

-SOURCE=.\png\png.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\png\pngconf.h
+SOURCE=.\regex\regcomp.c
+# ADD CPP /I "regex"
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\png\pngerror.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
+SOURCE=.\regex\regerror.c
+# ADD CPP /I "regex"

 # SUBTRACT CPP /YX /Yc /Yu
 # SUBTRACT CPP /YX /Yc /Yu

-
-!ENDIF 
-

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\png\pngget.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
+SOURCE=.\regex\regexec.c
+# ADD CPP /I "regex"

 # SUBTRACT CPP /YX /Yc /Yu
 # SUBTRACT CPP /YX /Yc /Yu

-
-!ENDIF 
-

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\png\pngmem.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngpread.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngread.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrio.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrtran.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngrutil.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngset.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngtrans.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwio.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwrite.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwtran.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\png\pngwutil.c
-
-!IF  "$(CFG)" == "wxvc - Win32 Release"
-
-# ADD CPP /I "../include zlib"
-# SUBTRACT CPP /I "../include" /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
-
-# ADD CPP /I "zlib"
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "XPM files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\xpm\crbuffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crbuffrp.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfrp.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\create.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrbuf.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crifrdat.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crpfrbuf.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crpfrdat.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\dataxpm.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\hashtab.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\misc.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\parse.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftodat.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftoi.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftop.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rgb.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\scan.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\simx.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrdat.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrp.c
-# ADD CPP /D "FOR_MSW"
-# 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
+SOURCE=.\regex\regfree.c
+# ADD CPP /I "regex"

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # 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
 # End Target
 # End Project
 # End Group
 # End Target
 # End Project