mingw compilation fixes

[wxWidgets.git] / src / wxvc_dll.dsp

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 8dd7b4f53692257bf6dc8dada1911e328ce8e06b..99b716ffa8c4f48a77206e3584bc847abbebfa5f 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="wxvc_dll" - Package Owner=<4>
 # Microsoft Developer Studio Project File - Name="wxvc_dll" - 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 **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102


@@ -17,12 +17,12 @@ CFG=wxvc_dll - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxvc_dll - Win32 Release" (based on\
- "Win32 (x86) Dynamic-Link Library")
+!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
 !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
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe


@@ -38,14 +38,14 @@ RSC=rc.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 "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
+# 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
 # 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 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 RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe


@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 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 uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"ReleaseDLL/wxvc.dll"
+# 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"
 
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 


@@ -64,14 +64,14 @@ LINK32=link.exe
 # 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 "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
+# 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
 # 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 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 RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe


@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # 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 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 uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"DebugDLL/wxvc.dll" /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 
 
 
 !ENDIF 
 


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


@@ -112,6 +120,10 @@ 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


@@ -120,7 +132,7 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\date.cpp
+SOURCE=.\common\datetime.cpp

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


@@ -132,6 +144,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


@@ -140,7 +156,7 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\dobjcmn.cpp
+SOURCE=.\common\dircmn.cpp

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


@@ -148,6 +164,10 @@ SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
 
 # 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


@@ -170,6 +190,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


@@ -195,6 +223,10 @@ 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


@@ -203,6 +235,10 @@ SOURCE=.\common\fontcmn.cpp
 # End Source File
 # Begin Source File
 
 # 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


@@ -211,7 +247,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
 


@@ -219,10 +260,18 @@ SOURCE=.\common\ftp.cpp
 # End Source File
 # Begin Source File
 
 # 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\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\gifdecod.cpp
 # End Source File
 # Begin Source File


@@ -239,6 +288,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


@@ -251,11 +304,33 @@ SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
 # 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\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


@@ -292,7 +367,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
 


@@ -304,6 +383,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


@@ -332,6 +415,14 @@ 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\resourc2.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\resourc2.cpp
 # End Source File
 # Begin Source File


@@ -380,11 +471,11 @@ 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
 


@@ -396,15 +487,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
 


@@ -458,6 +549,10 @@ 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
 SOURCE=.\common\zipstrm.cpp
 # ADD CPP /I "zlib"
 # End Source File


@@ -475,11 +570,27 @@ 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\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
 
 # End Source File
 # Begin Source File
 


@@ -531,7 +642,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
 


@@ -547,12 +662,32 @@ 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\tipdlg.cpp
 # End 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"
 
 # End Group
 # Begin Group "wxHTML Files"
 


@@ -595,7 +730,7 @@ SOURCE=.\html\htmprint.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -623,6 +758,10 @@ SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File
 
 # 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_pre.cpp
 # End Source File
 # Begin Source File


@@ -631,7 +770,7 @@ SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\html\search.cpp
+SOURCE=.\html\winpars.cpp

 # End Source File
 # End Group
 # Begin Group "MSW Files"
 # End Source File
 # End Group
 # Begin Group "MSW Files"


@@ -739,6 +878,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


@@ -747,6 +890,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


@@ -755,11 +902,15 @@ SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\dummydll.cpp
+SOURCE=.\msw\dummy.cpp

 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # Begin Source File
 
 # ADD CPP /Yc"wx/wxprec.h"
 # 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


@@ -772,6 +923,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


@@ -784,15 +943,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\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


@@ -841,6 +1017,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


@@ -873,11 +1053,6 @@ SOURCE=.\msw\penwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\pnghand.cpp
-# ADD CPP /I "png" /I "zlib"
-# 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


@@ -922,6 +1097,10 @@ 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


@@ -962,11 +1141,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
 


@@ -1000,10 +1179,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
-# End Source File

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


@@ -1133,222 +1308,1074 @@ SOURCE=.\png\pngwutil.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group

-# Begin Group "XPM Files"
+# Begin Group "Zlib Files"

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

-SOURCE=.\xpm\crbuffri.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\adler32.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crbuffrp.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\compress.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crdatfri.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\crc32.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crdatfrp.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\deflate.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\create.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\gzio.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crifrbuf.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\infblock.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crifrdat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\infcodes.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crpfrbuf.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\inffast.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\crpfrdat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\inflate.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\dataxpm.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\inftrees.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\hashtab.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\infutil.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\misc.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\trees.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\parse.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\uncompr.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 

-SOURCE=.\xpm\rdftodat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\zlib\zutil.c

 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "Setup"

 
 

-SOURCE=.\xpm\rdftoi.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\xpm\rdftop.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\include\wx\msw\setup.h

 # End Source File
 # End Source File

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

 
 

-SOURCE=.\xpm\rgb.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
+# PROP Default_Filter ""

 # Begin 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=.\jpeg\jcapimin.c

 
 

-SOURCE=.\xpm\simx.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"

 
 

-SOURCE=.\xpm\wrffrdat.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
+# ADD CPP /I "..\include" /I ".."
+# SUBTRACT CPP /I "../include" /YX /Yc /Yu

 
 

-SOURCE=.\xpm\wrffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"

 
 

-SOURCE=.\xpm\wrffrp.c
-# ADD CPP /D "FOR_MSW"
+# ADD CPP /Zi /I ".."

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

-# End Source File
-# End Group
-# Begin Group "Zlib Files"

 
 

-# PROP Default_Filter ""
-# Begin Source File
+!ENDIF 

 
 

-SOURCE=.\zlib\adler32.c
-# SUBTRACT CPP /YX /Yc /Yu

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

-SOURCE=.\zlib\compress.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\crc32.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\deflate.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\gzio.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\infblock.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\infcodes.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\inffast.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\inflate.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\inftrees.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\infutil.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\trees.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\uncompr.c
+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
 # SUBTRACT CPP /YX /Yc /Yu

+
+!ENDIF 
+

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

-SOURCE=.\zlib\zutil.c
+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
 # 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
 # End Source File
 # End Group

-# Begin Group "Setup"
+# Begin Group "TIFF files"

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

-SOURCE=..\include\wx\msw\setup.h
+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
 # End Target
 # End Source File
 # End Group
 # End Target