sleep while waiting for the spawned process to terminate so that we don't eat 100...

[wxWidgets.git] / src / wxBase.dsp

diff --git a/src/wxBase.dsp b/src/wxBase.dsp
index d14993979f4e0ef738dd99046a262e239c20bc8a..6b1e52b6b9e3478d0c42ad2b70d02729a3d78d77 100644 (file)
--- a/src/wxBase.dsp
+++ b/src/wxBase.dsp
@@ -30,7 +30,7 @@ CFG=wxBase - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "wxBase"
+# PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe
 # PROP Scc_LocalPath ""
 CPP=cl.exe
 RSC=rc.exe


@@ -48,7 +48,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "../BaseReleaseUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /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 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


@@ -58,8 +58,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 /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/wxbase233u.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/wxbase233u.dll"

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


@@ -74,7 +74,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../BaseDebugUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /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 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


@@ -84,8 +84,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 /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/wxbase233ud.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/wxbase233ud.dll"

 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"
 
 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release Unicode"
 


@@ -99,7 +99,7 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseReleaseUnicode"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseReleaseUnicode"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" " /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/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
 # 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


@@ -122,7 +122,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseDebugUnicode"
 # PROP Target_Dir ""
 # 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" " /YX /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
 # 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


@@ -146,7 +146,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "../BaseReleaseDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /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 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


@@ -156,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 /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/wxbase233.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/wxbase233.dll"

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


@@ -172,7 +172,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../BaseDebugDll"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /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 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


@@ -182,8 +182,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 /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/wxbase233d.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/wxbase233d.dll"

 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "wxBase - Win32 Release"
 


@@ -197,8 +197,8 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseRelease"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseRelease"
 # 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/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 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
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -220,8 +220,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib"
 # PROP Intermediate_Dir "..\BaseDebug"
 # PROP Target_Dir ""
 # 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" " /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 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
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe


@@ -253,6 +253,10 @@ SOURCE=.\common\appcmn.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


@@ -289,6 +293,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\encconv.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\encconv.cpp
 # End Source File
 # Begin Source File


@@ -345,6 +353,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\http.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File


@@ -389,10 +401,6 @@ SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -421,10 +429,6 @@ SOURCE=.\common\sckstrm.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File


@@ -445,6 +449,10 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=.\common\textfile.cpp
 # End Source File
 # Begin Source File


@@ -552,6 +560,10 @@ SOURCE=.\msw\utils.cpp
 
 SOURCE=.\msw\utilsexc.cpp
 # End Source File
 
 SOURCE=.\msw\utilsexc.cpp
 # End Source File

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

 
 # Begin Source File
 
 
 # Begin Source File
 


@@ -573,67 +585,67 @@ SOURCE=.\msw\gsockmsw.c
 # PROP Default_Filter ""
 # Begin Source File
 
 # 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"
 !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)"
 
 "../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"
 
 # 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)"
 
 "../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"
 # 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)"
 
 "../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"
 
 # 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)"
 
 "../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"
 
 # 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)"
 
 "../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"
 
 # 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)"
 
 "../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"
 # 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)"
 
 "../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"
 
 # 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)"
 
 "../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 
 
 # End Custom Build
 !ENDIF 


@@ -657,6 +669,10 @@ SOURCE=..\include\wx\chkconf.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


@@ -717,6 +733,10 @@ 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\encconv.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File


@@ -725,6 +745,10 @@ SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File


@@ -777,6 +801,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\intl.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File


@@ -789,6 +817,14 @@ SOURCE=..\include\wx\ipcbase.h
 # End Source File
 # Begin Source File
 
 # 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
 SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File


@@ -809,6 +845,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\mimetype.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\mimetype.h
 # End Source File
 # Begin Source File


@@ -825,7 +865,7 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

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

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


@@ -849,10 +889,6 @@ SOURCE=..\include\wx\sckstrm.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\snglinst.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\snglinst.h
 # End Source File
 # Begin Source File


@@ -877,6 +913,10 @@ SOURCE=..\include\wx\sysopt.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\textfile.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\textfile.h
 # End Source File
 # Begin Source File


@@ -921,6 +961,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\wfstream.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\wfstream.h
 # End Source File
 # Begin Source File


@@ -956,6 +1000,10 @@ SOURCE=..\include\wx\msw\dde.h
 
 SOURCE=..\include\wx\msw\mimetype.h
 # End 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
 
 # End Group
 # End Group