Applied patch [ 1195797 ] Fixes to compile on Win64

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index b85c015fc70d27151c4ca27848cb318235e4540b..47ee2fe5c51c22528f6223d841a249c811c179c3 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -49,7 +49,7 @@ CFG=wxWindows - Win32 Debug
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32


@@ -60,8 +60,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.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.5 /dll /machine:I386 /out:"../lib/wxmsw250u.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\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.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\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
 
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
 


@@ -78,7 +78,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # 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
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32


@@ -89,8 +89,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
-# 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.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.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\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# 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\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
 
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
 


@@ -106,7 +106,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -131,7 +131,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -157,7 +157,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /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" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32


@@ -168,8 +168,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.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.5 /dll /machine:I386 /out:"../lib/wxmsw250.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\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.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\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
 
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
 


@@ -186,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # 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
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32


@@ -197,8 +197,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
-# 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.5 /dll /machine:I386 /out:"../lib/wxmsw250d.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\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# 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\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 


@@ -214,7 +214,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /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" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -239,7 +239,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /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" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -263,8 +263,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "ReleaseDebug"
 # PROP Target_Dir ""
 CPP=cl.exe
 # PROP Intermediate_Dir "ReleaseDebug"
 # PROP Target_Dir ""
 CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c

 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -288,6 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"

+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File

 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""


@@ -305,6 +309,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\common\artprov.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\artprov.cpp
 # End Source File
 # Begin Source File


@@ -313,6 +321,14 @@ SOURCE=.\common\artstd.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\bookctrl.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


@@ -385,6 +401,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\common\dircmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\dircmn.cpp
 # End Source File
 # Begin Source File


@@ -514,6 +534,10 @@ SOURCE=.\common\gaugecmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\gbsizer.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


@@ -630,6 +654,10 @@ SOURCE=.\common\matrix.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File


@@ -730,10 +758,22 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 

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

 SOURCE=.\common\stopwatch.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\stopwatch.cpp
 # End Source File
 # Begin Source File


@@ -794,8 +834,7 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\uri.cpp

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


@@ -839,6 +878,18 @@ SOURCE=.\common\xpmdecod.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\xti.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\xtistrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\xtixml.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\zipstrm.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\zipstrm.cpp
 # End Source File
 # Begin Source File


@@ -859,11 +910,19 @@ SOURCE=.\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -891,10 +950,22 @@ SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\helpext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\htmllbox.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\listbkg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File


@@ -907,10 +978,22 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\printps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\propdlg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\renderg.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\renderg.cpp
 # End Source File
 # Begin Source File


@@ -943,10 +1026,6 @@ SOURCE=.\generic\statusbr.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


@@ -963,6 +1042,14 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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


@@ -1053,38 +1140,6 @@ SOURCE=.\html\winpars.cpp
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""

-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# 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 Source File
 
 SOURCE=.\msw\accel.cpp
 # Begin Source File
 
 SOURCE=.\msw\accel.cpp


@@ -1163,6 +1218,10 @@ SOURCE=.\msw\data.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1187,6 +1246,10 @@ SOURCE=.\msw\dde.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1211,6 +1274,10 @@ SOURCE=.\msw\display.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1272,13 +1339,11 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsocket.cpp

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

-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsockmsw.cpp

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


@@ -1326,6 +1391,10 @@ SOURCE=.\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1362,19 +1431,43 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\ownerdrw.cpp
+SOURCE=.\msw\ole\access.cpp

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

-SOURCE=.\msw\palette.cpp
+SOURCE=.\msw\ole\automtn.cpp

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

-SOURCE=.\msw\pen.cpp
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp

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

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


@@ -1430,6 +1523,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\sound.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


@@ -1438,6 +1535,10 @@ SOURCE=.\msw\spinctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\stackwalk.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


@@ -1458,6 +1559,10 @@ SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1498,6 +1603,10 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1518,82 +1627,258 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group

-# Begin Group "Headers"
+# Begin Group "Other Sources"

 
 # PROP Default_Filter ""
 
 # PROP Default_Filter ""

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

 
 

-# PROP Default_Filter ""
+SOURCE=.\xml\xml.cpp
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_bmp.cpp
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+SOURCE=.\xrc\xh_bmpbt.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_bttn.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+SOURCE=.\xrc\xh_cald.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_chckb.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+SOURCE=.\xrc\xh_chckl.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_choic.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+SOURCE=.\xrc\xh_choicbk.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_combo.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+SOURCE=.\xrc\xh_datectrl.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_dlg.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+SOURCE=.\xrc\xh_frame.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_gauge.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+SOURCE=.\xrc\xh_gdctl.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_html.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+SOURCE=.\xrc\xh_listb.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_listbk.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+SOURCE=.\xrc\xh_listc.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_mdi.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+SOURCE=.\xrc\xh_menu.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_notbk.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+SOURCE=.\xrc\xh_panel.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_radbt.cpp
+# End Source File
+# Begin Source File

 
 

-"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
+SOURCE=.\xrc\xh_radbx.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=.\xrc\xh_scrol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_slidr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_spin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_split.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_statbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stlin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sttxt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tglbtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_toolb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_unkwn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_wizrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlres.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlrsall.cpp
+# End Source File
+# End Group
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
+
+# End Custom Build

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 


@@ -1642,6 +1927,10 @@ SOURCE=..\include\wx\access.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\afterstd.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File


@@ -1650,10 +1939,22 @@ SOURCE=..\include\wx\apptrait.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\archive.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\arrstr.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\beforestd.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File


@@ -1662,6 +1963,10 @@ SOURCE=..\include\wx\bmpbuttn.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\bookctrl.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\brush.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\brush.h
 # End Source File
 # Begin Source File


@@ -1710,6 +2015,10 @@ SOURCE=..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File


@@ -1774,11 +2083,15 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\datetime.h
+SOURCE=..\include\wx\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\dateevt.h

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

-SOURCE=..\include\wx\datetime.inl
+SOURCE=..\include\wx\datetime.h

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


@@ -1818,6 +2131,10 @@ SOURCE=..\include\wx\dcmemory.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\dcmirror.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\dcprint.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\dcprint.h
 # End Source File
 # Begin Source File


@@ -1838,6 +2155,10 @@ SOURCE=..\include\wx\debug.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\debugrpt.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\defs.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\defs.h
 # End Source File
 # Begin Source File


@@ -1866,6 +2187,10 @@ SOURCE=..\include\wx\display.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\dlimpexp.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File


@@ -1902,10 +2227,22 @@ SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\encinfo.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\except.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File


@@ -1990,6 +2327,10 @@ SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\gbsizer.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File


@@ -2026,6 +2367,10 @@ SOURCE=..\include\wx\hashmap.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\hashset.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\help.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\help.h
 # End Source File
 # Begin Source File


@@ -2034,10 +2379,18 @@ SOURCE=..\include\wx\helpbase.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\helphtml.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\helpwin.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\helpwin.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\htmllbox.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File


@@ -2046,6 +2399,10 @@ SOURCE=..\include\wx\iconbndl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\iconloc.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File


@@ -2090,6 +2447,10 @@ SOURCE=..\include\wx\imagxpm.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\init.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File


@@ -2138,6 +2499,10 @@ SOURCE=..\include\wx\listbase.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\listbook.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File


@@ -2166,6 +2531,10 @@ SOURCE=..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File


@@ -2210,6 +2579,10 @@ SOURCE=..\include\wx\msgout.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msgout.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File


@@ -2218,6 +2591,10 @@ SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File


@@ -2270,6 +2647,34 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\ftp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\http.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\quantize.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\quantize.h
 # End Source File
 # Begin Source File


@@ -2294,6 +2699,10 @@ SOURCE=..\include\wx\region.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\renderer.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\sashwin.h
 # End Source File
 # Begin Source File


@@ -2310,6 +2719,18 @@ SOURCE=..\include\wx\sckstrm.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\scrolbar.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\scrolbar.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\scrolbar.h
 # End Source File
 # Begin Source File


@@ -2342,6 +2763,10 @@ SOURCE=..\include\wx\socket.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\sound.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File


@@ -2358,10 +2783,18 @@ SOURCE=..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\sstream.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\stack.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\stack.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\stackwalk.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\statbmp.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\statbmp.h
 # End Source File
 # Begin Source File


@@ -2382,6 +2815,18 @@ SOURCE=..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\stdpaths.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\stockitem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\stopwatch.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\strconv.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\strconv.h
 # End Source File
 # Begin Source File


@@ -2414,10 +2859,6 @@ SOURCE=..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\textbuf.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\textbuf.h
 # End Source File
 # Begin Source File


@@ -2486,6 +2927,10 @@ SOURCE=..\include\wx\types.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\uri.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\url.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\url.h
 # End Source File
 # Begin Source File


@@ -2518,10 +2963,26 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\vidmode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vms_x_fix.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\volume.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\volume.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\vscroll.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File


@@ -2542,31 +3003,211 @@ SOURCE=..\include\wx\wx.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\wx_cw.h
+SOURCE=..\include\wx\wxchar.h

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

-SOURCE=..\include\wx\wx_cw_cm.h
+SOURCE=..\include\wx\wxhtml.h

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

-SOURCE=..\include\wx\wx_cw_d.h
+SOURCE=..\include\wx\wxprec.h

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

-SOURCE=..\include\wx\wxchar.h
+SOURCE=..\include\wx\xml\xml.h

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

-SOURCE=..\include\wx\wxhtml.h
+SOURCE=..\include\wx\xpmdecod.h

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

-SOURCE=..\include\wx\wxprec.h
+SOURCE=..\include\wx\xpmhand.h

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

-SOURCE=..\include\wx\xpmdecod.h
+SOURCE=..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choicbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xti.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xtistrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xtixml.h

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


@@ -2586,10 +3227,6 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\msw\access.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File


@@ -2630,6 +3267,10 @@ SOURCE=..\include\wx\msw\checklst.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\chkconf.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\choice.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\choice.h
 # End Source File
 # Begin Source File


@@ -2654,10 +3295,18 @@ SOURCE=..\include\wx\msw\control.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\crashrpt.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File


@@ -2682,6 +3331,10 @@ SOURCE=..\include\wx\msw\dde.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\debughlp.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\dialog.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\dialog.h
 # End Source File
 # Begin Source File


@@ -2702,6 +3355,10 @@ SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\fdrepdlg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\fdrepdlg.h
 # End Source File
 # Begin Source File


@@ -2742,6 +3399,14 @@ SOURCE=..\include\wx\msw\glcanvas.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\gsockmsw.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File


@@ -2822,6 +3487,42 @@ SOURCE=..\include\wx\msw\notebook.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\oleutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\palette.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\palette.h
 # End Source File
 # Begin Source File


@@ -2830,6 +3531,10 @@ SOURCE=..\include\wx\msw\pen.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\popupwin.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\printdlg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\printdlg.h
 # End Source File
 # Begin Source File


@@ -2866,11 +3571,15 @@ SOURCE=..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\setup0.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\msw\slidrmsw.h
+SOURCE=..\include\wx\msw\sound.h

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


@@ -2882,6 +3591,10 @@ SOURCE=..\include\wx\msw\spinctrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\stackwalk.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\msw\statbmp.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\msw\statbmp.h
 # End Source File
 # Begin Source File


@@ -2942,7 +3655,7 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\msw\wave.h
+SOURCE=..\include\wx\msw\uxtheme.h

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


@@ -2952,6 +3665,18 @@ SOURCE=..\include\wx\msw\window.h
 
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File

+# Begin Source File
+
+SOURCE=..\include\wx\msw\wrapcctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\wrapcdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\wrapwin.h
+# End Source File

 # End Group
 # Begin Group "Generic"
 
 # End Group
 # Begin Group "Generic"
 


@@ -2966,10 +3691,6 @@ SOURCE=..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\caret.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File


@@ -2978,15 +3699,15 @@ SOURCE=..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\dcpsg.h
+SOURCE=..\include\wx\generic\datectrl.h

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

-SOURCE=..\include\wx\generic\dirctrlg.h
+SOURCE=..\include\wx\generic\dcpsg.h

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

-SOURCE=..\include\wx\generic\dirdlgg.h
+SOURCE=..\include\wx\generic\dirctrlg.h

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


@@ -2994,10 +3715,6 @@ SOURCE=..\include\wx\generic\dragimgg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\fdrepdlg.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\generic\filedlgg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\filedlgg.h
 # End Source File
 # Begin Source File


@@ -3014,7 +3731,7 @@ SOURCE=..\include\wx\generic\gridctrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\gridg.h
+SOURCE=..\include\wx\generic\gridsel.h

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


@@ -3030,11 +3747,7 @@ SOURCE=..\include\wx\generic\laywin.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\mdig.h
+SOURCE=..\include\wx\generic\logg.h

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


@@ -3046,7 +3759,7 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\paletteg.h
+SOURCE=..\include\wx\generic\numdlgg.h

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


@@ -3066,6 +3779,10 @@ SOURCE=..\include\wx\generic\progdlgg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\generic\sashwin.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\sashwin.h
 # End Source File
 # Begin Source File


@@ -3086,18 +3803,6 @@ SOURCE=..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\generic\statline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\statusbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\tabg.h
-# End Source File
-# Begin Source File
-

 SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File


@@ -3150,6 +3855,10 @@ SOURCE=..\include\wx\html\htmlpars.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\html\htmlproc.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\html\htmltag.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\html\htmltag.h
 # End Source File
 # Begin Source File