fix build for watcom

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 6aafa79b07d41367d2480c5b7f1f64d7dfea332a..6663e0a38fafae336ebb0cce45b84a012f4e3a4d 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -18,6 +18,10 @@ CFG=wxWindows - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

+!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")

 !MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")


@@ -26,12 +30,110 @@ CFG=wxWindows - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "wxWindows"
-# PROP Scc_LocalPath ".."
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""

 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 

-!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/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"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicodeDll"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../ReleaseUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../ReleaseUnicode"
+# PROP Target_Dir ""
+# 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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "../lib"
+# PROP BASE Intermediate_Dir "../DebugUnicode"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../lib"
+# PROP Intermediate_Dir "../DebugUnicode"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -41,11 +143,11 @@ RSC=rc.exe
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "../lib"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "../lib"

-# PROP Intermediate_Dir "../ReleaseDLL"
+# PROP Intermediate_Dir "../ReleaseDll"

 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c

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

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"


@@ -54,8 +156,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/wxmsw.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw.dll"
+# 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"

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


@@ -71,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c

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

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"


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

 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "../Release"
+# PROP BASE Output_Dir "../lib"

 # PROP BASE Intermediate_Dir "../Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP BASE Intermediate_Dir "../Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "../Release"
+# PROP Output_Dir "../lib"

 # PROP Intermediate_Dir "../Release"
 # PROP Target_Dir ""
 # PROP Intermediate_Dir "../Release"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD 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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 # ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409


@@ -110,12 +212,12 @@ LIB32=link.exe -lib
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "../Debug"
+# PROP BASE Output_Dir "../lib"

 # PROP BASE Intermediate_Dir "../Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP BASE Intermediate_Dir "../Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "../Debug"
+# PROP Output_Dir "../lib"

 # PROP Intermediate_Dir "../Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Intermediate_Dir "../Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c


@@ -133,6 +235,10 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

+# Name "wxWindows - Win32 Release Unicode DLL"
+# Name "wxWindows - Win32 Debug Unicode DLL"
+# Name "wxWindows - Win32 Release Unicode"
+# Name "wxWindows - Win32 Debug Unicode"

 # Name "wxWindows - Win32 Release DLL"
 # Name "wxWindows - Win32 Debug DLL"
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Release DLL"
 # Name "wxWindows - Win32 Debug DLL"
 # Name "wxWindows - Win32 Release"


@@ -142,10 +248,22 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

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

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

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


@@ -154,6 +272,10 @@ SOURCE=.\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -186,6 +308,10 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -234,6 +360,14 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -242,6 +376,10 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -330,6 +468,10 @@ SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -338,6 +480,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -350,10 +496,18 @@ SOURCE=.\common\image.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -426,23 +580,19 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\mstream.cpp
+SOURCE=.\common\msgout.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
+SOURCE=.\common\mstream.cpp

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

-SOURCE=.\common\objstrm.cpp
+SOURCE=.\common\nbkbase.cpp

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

-SOURCE=.\common\odbc.cpp
+SOURCE=.\common\object.cpp

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


@@ -478,7 +628,7 @@ SOURCE=.\common\regex.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\resource.cpp
+SOURCE=.\common\rgncmn.cpp

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


@@ -498,7 +648,7 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\serbase.cpp
+SOURCE=.\common\settcmn.cpp

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


@@ -510,6 +660,10 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -526,10 +680,18 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -594,10 +756,6 @@ SOURCE=.\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\wxexpr.cpp
-# End Source File
-# Begin Source File
-

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


@@ -620,12 +778,6 @@ SOURCE=.\common\unzip.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 

-# Begin Source File
-
-SOURCE=.\common\y_tab.c
-# ADD CPP /W1 /D "USE_DEFINE"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File

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


@@ -644,6 +796,14 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -684,18 +844,6 @@ SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\prop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\propform.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\generic\proplist.cpp
-# End Source File
-# Begin Source File
-

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


@@ -740,10 +888,6 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\generic\treelay.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\generic\wizard.cpp
 # End Source File
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
 


@@ -817,11 +961,11 @@ SOURCE=.\html\m_list.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

-SOURCE=.\html\m_pre.cpp
+SOURCE=.\html\m_style.cpp

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


@@ -903,10 +1047,6 @@ SOURCE=.\msw\control.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\curico.cpp
-# End Source File
-# Begin Source File
-

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


@@ -951,15 +1091,15 @@ SOURCE=.\msw\dib.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\dibutils.cpp
+SOURCE=.\msw\dir.cpp

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

-SOURCE=.\msw\dir.cpp
+SOURCE=.\msw\dirdlg.cpp

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

-SOURCE=.\msw\dirdlg.cpp
+SOURCE=.\msw\display.cpp

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


@@ -1039,6 +1179,10 @@ SOURCE=.\msw\imaglist.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1083,6 +1227,10 @@ SOURCE=.\msw\msgdlg.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1107,6 +1255,10 @@ SOURCE=.\msw\penwin.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\popupwin.cpp
+# 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


@@ -1227,6 +1379,10 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1245,12 +1401,15 @@ SOURCE=.\msw\gsockmsw.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 

-# End Group

 # Begin Group "OLE Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 # 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\automtn.cpp
 # End Source File
 # Begin Source File


@@ -1274,6 +1433,7 @@ SOURCE=.\msw\ole\oleutils.cpp
 SOURCE=.\msw\ole\uuid.cpp
 # End Source File
 
 SOURCE=.\msw\ole\uuid.cpp
 # End Source File
 

+# End Group

 # End Group
 # Begin Group "Headers"
 
 # End Group
 # Begin Group "Headers"
 


@@ -1283,37 +1443,69 @@ SOURCE=.\msw\ole\uuid.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\include\wx\msw\setup0.h
-!IF  "$(CFG)" == "wxWindows - Win32 Release DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+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)"
 
 "../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\mswdll\wx\setup.h
+       copy "$(InputPath)" ..\lib\mswdll\wx\setup.h

 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"

-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# 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)"
 
 "../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\mswdlld\wx\setup.h
+       copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h

 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"

-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h

 
 "../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 
 "../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\msw\wx\setup.h
+       copy "$(InputPath)" ..\lib\msw\wx\setup.h

 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"

-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h

 
 "../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 
 "../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\mswd\wx\setup.h
+       copy "$(InputPath)" ..\lib\mswd\wx\setup.h

 
 # End Custom Build
 !ENDIF 
 
 # End Custom Build
 !ENDIF 


@@ -1328,10 +1520,18 @@ SOURCE=..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\access.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
 

+SOURCE=..\include\wx\artprov.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


@@ -1348,6 +1548,10 @@ SOURCE=..\include\wx\buffer.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1388,10 +1592,18 @@ SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -1440,10 +1652,6 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1476,6 +1684,10 @@ SOURCE=..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1520,10 +1732,18 @@ SOURCE=..\include\wx\dir.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

+SOURCE=..\include\wx\display.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


@@ -1548,6 +1768,14 @@ SOURCE=..\include\wx\dynlib.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1556,11 +1784,11 @@ SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\expr.h
+SOURCE=..\include\wx\fdrepdlg.h

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

-SOURCE=..\include\wx\fdrepdlg.h
+SOURCE=..\include\wx\features.h

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


@@ -1668,6 +1896,10 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\hashmap.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


@@ -1688,6 +1920,10 @@ SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\iconbndl.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


@@ -1700,6 +1936,10 @@ SOURCE=..\include\wx\imaggif.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1732,10 +1972,18 @@ SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -1764,6 +2012,10 @@ SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\listbase.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


@@ -1780,6 +2032,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1796,6 +2052,10 @@ SOURCE=..\include\wx\memory.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1824,23 +2084,19 @@ SOURCE=..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

-SOURCE=..\include\wx\object.h
+SOURCE=..\include\wx\mstream.h

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

-SOURCE=..\include\wx\objstrm.h
+SOURCE=..\include\wx\notebook.h

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

-SOURCE=..\include\wx\odbc.h
+SOURCE=..\include\wx\object.h

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


@@ -1864,6 +2120,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -1888,15 +2148,7 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\prop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\propform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\proplist.h
+SOURCE=..\include\wx\quantize.h

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


@@ -1908,15 +2160,15 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\regex.h
+SOURCE=..\include\wx\rawbmp.h

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

-SOURCE=..\include\wx\region.h
+SOURCE=..\include\wx\regex.h

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

-SOURCE=..\include\wx\resource.h
+SOURCE=..\include\wx\region.h

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


@@ -1944,10 +2196,6 @@ SOURCE=..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2044,6 +2292,10 @@ SOURCE=..\include\wx\tbarsmpl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2064,10 +2316,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2144,6 +2392,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\volume.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


@@ -2180,10 +2432,6 @@ SOURCE=..\include\wx\wxchar.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2213,6 +2461,10 @@ 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


@@ -2269,14 +2521,6 @@ SOURCE=..\include\wx\msw\control.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\msw\curico.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\curicop.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


@@ -2313,10 +2557,6 @@ SOURCE=..\include\wx\msw\dib.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2349,15 +2589,11 @@ SOURCE=..\include\wx\msw\frame.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

-SOURCE=..\include\wx\msw\gaugemsw.h
+SOURCE=..\include\wx\msw\gccpriv.h

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


@@ -2433,10 +2669,18 @@ SOURCE=..\include\wx\msw\minifram.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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

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

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


@@ -2489,14 +2733,6 @@ SOURCE=..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\include\wx\msw\settings.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\slider.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


@@ -2509,6 +2745,10 @@ SOURCE=..\include\wx\msw\spinbutt.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\msw\spinctrl.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


@@ -2561,6 +2801,10 @@ SOURCE=..\include\wx\msw\tooltip.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2650,10 +2894,6 @@ SOURCE=..\include\wx\generic\helphtml.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2666,6 +2906,10 @@ SOURCE=..\include\wx\generic\listctrl.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2702,6 +2946,10 @@ SOURCE=..\include\wx\generic\scrolwin.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -2710,6 +2958,10 @@ 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\statusbr.h
 # End Source File
 # Begin Source File


@@ -2722,6 +2974,10 @@ SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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