revert my last change

[wxWidgets.git] / src / wxBase.dsp

diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index 2f3ff02cb69fce497fcaaa1cf2da9bb3f16ee78e..d5a6e0ac498888facd19128f2f44c43590301a7f 100644 (file)
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -49,7 +49,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 " /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /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"
@@ -58,8 +58,8 @@ 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 /nologo /dll /machine:I386 /out:"../lib/wxbase232u.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase232u.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"
 
@@ -75,7 +75,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 " /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /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"
@@ -84,9 +84,8 @@ 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232ud.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232ud.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
@@ -100,7 +99,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\BaseReleaseUnicode"
 # 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/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 " /D "_UNICODE" /D "UNICODE/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -123,7 +122,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "..\BaseDebugUnicode"
 # 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/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 " /D "_UNICODE" /D "UNICODE/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -147,7 +146,7 @@ LIB32=link.exe -lib
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 " /D "WXMAKINGDLL/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /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"
@@ -156,8 +155,8 @@ 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 /nologo /dll /machine:I386 /out:"../lib/wxbase232.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlib.lib ../lib/regex.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase232.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"
 
@@ -173,7 +172,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 " /D "WXMAKINGDLL/Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /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"
@@ -182,8 +181,8 @@ 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232d.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib ../lib/zlibd.lib ../lib/regexd.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxbase232d.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"
 
@@ -265,6 +264,10 @@ SOURCE=.\common\config.cpp
 # 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
@@ -293,6 +296,10 @@ SOURCE=.\common\dynlib.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dynload.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\encconv.cpp
 # End Source File
 # Begin Source File
@@ -349,6 +356,10 @@ SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\hashmap.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
@@ -385,15 +396,15 @@ SOURCE=.\common\module.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\mstream.cpp
+SOURCE=.\common\msgout.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\object.cpp
+SOURCE=.\common\mstream.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\objstrm.cpp
+SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
@@ -425,10 +436,6 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\serbase.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
@@ -560,6 +567,10 @@ SOURCE=.\msw\utils.cpp
 
 SOURCE=.\msw\utilsexc.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\msw\volume.cpp
+# End Source File
 
 # Begin Source File
 
@@ -587,7 +598,7 @@ SOURCE=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\basedllu\wx\setup.h
+       copy "$(InputPath)" ..\lib\basedllu\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode DLL"
@@ -595,14 +606,14 @@ InputPath=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\basedllud\wx\setup.h
+       copy "$(InputPath)" ..\lib\basedllud\wx\setup.h
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"
 # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/baseu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\baseu\wx\setup.h
+       copy "$(InputPath)" ..\lib\baseu\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug Unicode"
@@ -610,7 +621,7 @@ InputPath=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/baseud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\baseud\wx\setup.h
+       copy "$(InputPath)" ..\lib\baseud\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release DLL"
@@ -618,7 +629,7 @@ InputPath=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\basedll\wx\setup.h
+       copy "$(InputPath)" ..\lib\basedll\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug DLL"
@@ -626,14 +637,14 @@ InputPath=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/basedlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\basedlld\wx\setup.h
+       copy "$(InputPath)" ..\lib\basedlld\wx\setup.h
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"
 # Begin Custom Build - Copying $(InputPath) to $(TargetDir)
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/base/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\base\wx\setup.h
+       copy "$(InputPath)" ..\lib\base\wx\setup.h
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
@@ -641,7 +652,7 @@ InputPath=..\include\wx\msw\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "../lib/based/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy $(InputPath) ..\lib\based\wx\setup.h
+       copy "$(InputPath)" ..\lib\based\wx\setup.h
 
 # End Custom Build
 !ENDIF 
@@ -661,6 +672,10 @@ SOURCE=..\include\wx\buffer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\build.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\chkconf.h
 # End Source File
 # Begin Source File
@@ -681,10 +696,6 @@ SOURCE=..\include\wx\config.h
 # 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
@@ -701,6 +712,10 @@ SOURCE=..\include\wx\db.h
 # 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
@@ -729,6 +744,10 @@ SOURCE=..\include\wx\dynlib.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dynload.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
@@ -737,6 +756,10 @@ SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\features.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File
@@ -789,18 +812,38 @@ SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\hashmap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\intl.h
 # 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\ipc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\isql.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\isqlext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
@@ -813,6 +856,10 @@ SOURCE=..\include\wx\longlong.h
 # 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
@@ -833,15 +880,15 @@ SOURCE=..\include\wx\module.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\mstream.h
+SOURCE=..\include\wx\msgout.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\object.h
+SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\objstrm.h
+SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
@@ -869,10 +916,6 @@ SOURCE=..\include\wx\sckstrm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\serbase.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\snglinst.h
 # End Source File
 # Begin Source File
@@ -909,10 +952,6 @@ SOURCE=..\include\wx\thread.h
 # 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
@@ -945,6 +984,10 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\volume.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wfstream.h
 # End Source File
 # Begin Source File
@@ -978,8 +1021,16 @@ 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
+
+SOURCE=..\include\wx\msw\winundef.h
+# End Source File
 
 # End Group
 # End Group