# 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/wxmsw233u.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/wxmsw233u.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/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"
# 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/wxmsw233ud.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/wxmsw233ud.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/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"
# 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/wxmsw233.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/wxmsw233.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"
# 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/wxmsw233d.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/wxmsw233d.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 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
# 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
# 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
# End Source File
# Begin Source File
-SOURCE=.\common\odbc.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common\paper.cpp
# End Source File
# Begin Source File
# 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
+SOURCE=.\common\taskbarcmn.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\common\tbarbase.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
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
-# Begin Source File
-
-SOURCE=.\common\dosyacc.c
-# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
# End Group
# Begin Group "Generic Files"
# 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
# End Source File
# Begin Source File
-SOURCE=.\generic\treelay.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\generic\wizard.cpp
# End Source File
# End Source File
# Begin Source File
-SOURCE=.\html\m_meta.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\html\m_pre.cpp
# End Source File
# Begin Source File
# 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
# End Source File
# Begin Source File
-SOURCE=.\msw\dibutils.cpp
+SOURCE=.\msw\dir.cpp
# End Source File
# Begin Source File
-SOURCE=.\msw\dir.cpp
+SOURCE=.\msw\dirdlg.cpp
# End Source File
# Begin Source File
-SOURCE=.\msw\dirdlg.cpp
+SOURCE=.\msw\display.cpp
# End Source File
# Begin Source File
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
-# End Group
# 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\uuid.cpp
# End Source File
+# End Group
# End Group
# Begin Group "Headers"
# 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
# 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
# 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
# End Source File
# Begin Source File
-SOURCE=..\include\wx\expr.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\wx\fdrepdlg.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
# 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
# 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
# End Source File
# Begin Source File
-SOURCE=..\include\wx\odbc.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\wx\ownerdrw.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
-SOURCE=..\include\wx\regex.h
+SOURCE=..\include\wx\rawbmp.h
# End Source File
# Begin Source File
-SOURCE=..\include\wx\region.h
+SOURCE=..\include\wx\regex.h
# 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
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\wx\timer.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
# 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
# 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
# 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
# End Source File
# Begin Source File
-SOURCE=..\include\wx\msw\gaugemsw.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\wx\msw\gccpriv.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\include\wx\generic\helphtml.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\wx\generic\imaglist.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