revert my last change

[wxWidgets.git] / src / wxBase.dsp

diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index fc4d20fe8cd2e584159c25199a4080e71a0f9ee9..d5a6e0ac498888facd19128f2f44c43590301a7f 100644 (file)
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -30,7 +30,7 @@ CFG=wxBase - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "wxBase"
+# PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
@@ -48,8 +48,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "../BaseReleaseUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# 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 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"
 
@@ -74,8 +74,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../BaseDebugUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# 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 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
@@ -99,8 +98,8 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseReleaseUnicode"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /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/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
@@ -122,8 +121,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseDebugUnicode"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c
+# 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 BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -146,8 +145,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "../BaseReleaseDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# 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 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"
 
@@ -172,8 +171,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../BaseDebugDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /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 "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# 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 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"
 
@@ -197,8 +196,8 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseRelease"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /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/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -220,8 +219,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseDebug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_MT" /Yu"wx/wxprec.h" /FD /c
+# 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/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -253,6 +252,10 @@ SOURCE=.\common\appcmn.cpp
 # 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
@@ -261,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
@@ -289,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
@@ -345,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
@@ -381,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
 
@@ -421,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
@@ -445,6 +456,10 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\textbuf.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\textfile.cpp
 # End Source File
 # Begin Source File
@@ -552,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
 
@@ -573,67 +592,67 @@ SOURCE=.\msw\gsockmsw.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\include\wx\msw\setup0.h
+SOURCE=..\include\wx\msw\setup.h
 !IF  "$(CFG)" == "wxBase - Win32 Release Unicode DLL"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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 - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# 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"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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 - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# 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"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup0.h
+# Begin Custom Build - Copying $(InputPath) to $(TargetDir)
+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 
@@ -653,23 +672,27 @@ 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
 
-SOURCE=..\include\wx\cmdline.h
+SOURCE=..\include\wx\clntdata.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\confbase.h
+SOURCE=..\include\wx\cmdline.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\config.h
+SOURCE=..\include\wx\confbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\date.h
+SOURCE=..\include\wx\config.h
 # End Source File
 # Begin Source File
 
@@ -689,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
@@ -717,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
@@ -725,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
@@ -777,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
@@ -801,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
@@ -809,6 +868,10 @@ SOURCE=..\include\wx\memory.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\memtext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\mimetype.h
 # End Source File
 # Begin Source File
@@ -817,6 +880,10 @@ SOURCE=..\include\wx\module.h
 # 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
@@ -825,7 +892,7 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\objstrm.h
+SOURCE=..\include\wx\platform.h
 # End Source File
 # Begin Source File
 
@@ -849,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
@@ -877,15 +940,15 @@ SOURCE=..\include\wx\sysopt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\textfile.h
+SOURCE=..\include\wx\textbuf.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\thread.h
+SOURCE=..\include\wx\textfile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\time.h
+SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
@@ -921,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
@@ -954,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