# 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 /nologo /dll /machine:I386 /out:"../lib/wxbase233u.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233u.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 /nologo /dll /machine:I386 /out:"../lib/wxbase250u.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250u.dll"
!ELSEIF "$(CFG)" == "wxBase - 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233ud.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233ud.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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase250ud.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250ud.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode"
# PROP BASE Use_MFC 0
# 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 /nologo /dll /machine:I386 /out:"../lib/wxbase233.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233.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 /nologo /dll /machine:I386 /out:"../lib/wxbase250.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250.dll"
!ELSEIF "$(CFG)" == "wxBase - 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233d.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase233d.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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase250d.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250d.dll"
!ELSEIF "$(CFG)" == "wxBase - Win32 Release"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\common\appcmn.cpp
+SOURCE=.\common\appbase.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\common\fontmap.cpp
+SOURCE=.\common\fmapbase.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\common\stopwatch.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\common\strconv.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\common\timercmn.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\common\tokenzr.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\msw\basemsw.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\dde.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\regconf.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=..\include\wx\apptrait.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\buffer.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\dbkeyg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\dbtable.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=..\include\wx\fmappriv.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\fontenc.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\memconf.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
# PROP Default_Filter ""
# Begin Source File
+SOURCE=..\include\wx\msw\apptbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\apptrait.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\msw\dde.h
# End Source File
# Begin Source File
+SOURCE=..\include\wx\msw\gccpriv.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\wx\msw\mimetype.h
# End Source File
# Begin Source File