makefile regen, include fix, duplicate file fix

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index aa56a9f88e3e805efb30184934245a17895ef5fd..ea5c20a9ac644aac662c43c6dc70aeb3b3dc9584 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -27,7 +27,6 @@ CFG=wxWindows - Win32 Debug
 !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Release Unicode With Debug Info" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -50,7 +49,7 @@ CFG=wxWindows - Win32 Debug
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -79,7 +78,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -107,7 +106,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -132,7 +131,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -158,7 +157,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -187,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -215,7 +214,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -240,7 +239,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -265,7 +264,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -276,31 +275,6 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\wxmswu.lib"
-# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
-
 !ENDIF 
 
 # Begin Target
@@ -314,7 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
-# Name "wxWindows - Win32 Release Unicode With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -332,6 +309,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\archive.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\artprov.cpp
 # End Source File
 # Begin Source File
@@ -565,10 +546,6 @@ SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\gzstream.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
@@ -673,6 +650,10 @@ SOURCE=.\common\matrix.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\mediactrlcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
@@ -773,10 +754,22 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\stdpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\stockitem.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\stopwatch.cpp
 # End Source File
 # Begin Source File
@@ -837,8 +830,7 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\uri.cpp
 # End Source File
 # Begin Source File
 
@@ -914,11 +906,11 @@ SOURCE=.\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\choicdgg.cpp
+SOURCE=.\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dcbuffer.cpp
+SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
@@ -1138,18 +1130,10 @@ SOURCE=.\msw\accel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\basemsw.cpp
 # End Source File
 # Begin Source File
@@ -1218,10 +1202,6 @@ SOURCE=.\msw\data.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\dc.cpp
 # End Source File
 # Begin Source File
@@ -1274,14 +1254,6 @@ SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
@@ -1339,13 +1311,11 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsocket.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
@@ -1393,6 +1363,10 @@ SOURCE=.\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\mediactrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\menu.cpp
 # End Source File
 # Begin Source File
@@ -1429,10 +1403,34 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # 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\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\ole\oleutils.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\ownerdrw.cpp
 # End Source File
 # Begin Source File
@@ -1497,6 +1495,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\sound.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
@@ -1525,6 +1527,10 @@ SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\stdpaths.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\tabctrl.cpp
 # End Source File
 # Begin Source File
@@ -1565,19 +1571,19 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utils.cpp
+SOURCE=.\msw\urlmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsexc.cpp
+SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsgui.cpp
+SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\uuid.cpp
+SOURCE=.\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
 
@@ -1589,10 +1595,6 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\wave.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group
@@ -1603,6 +1605,162 @@ SOURCE=.\msw\window.cpp
 
 SOURCE=.\xml\xml.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmpbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bttn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_cald.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_choic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_combo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_dlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_frame.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gauge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gdctl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_html.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_menu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_notbk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_panel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scrol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_slidr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_spin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_split.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_statbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stlin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sttxt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tglbtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_toolb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_unkwn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_wizrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlres.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlrsall.cpp
+# End Source File
 # End Group
 # Begin Group "Headers"
 
@@ -1704,16 +1862,6 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
-
-"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
@@ -1803,6 +1951,10 @@ SOURCE=..\include\wx\checklst.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\chkconf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\choicdlg.h
 # End Source File
 # Begin Source File
@@ -1811,6 +1963,10 @@ SOURCE=..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
@@ -1935,6 +2091,14 @@ SOURCE=..\include\wx\dde.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\defs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dialog.h
 # End Source File
 # Begin Source File
@@ -2019,15 +2183,15 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\ffile.h
+SOURCE=..\include\wx\features.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\file.h
+SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\file.h
+SOURCE=..\include\wx\file.h
 # End Source File
 # Begin Source File
 
@@ -2095,11 +2259,7 @@ SOURCE=..\include\wx\fs_zip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\ftp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\gauge.h
+SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
@@ -2135,10 +2295,6 @@ SOURCE=..\include\wx\gsocket.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\gzstream.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
@@ -2171,10 +2327,6 @@ SOURCE=..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\http.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -2315,6 +2467,10 @@ SOURCE=..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File
@@ -2371,6 +2527,10 @@ SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
@@ -2395,6 +2555,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
@@ -2419,6 +2583,18 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\protocol\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\ftp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\http.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\protocol\protocol.h
 # End Source File
 # Begin Source File
@@ -2519,6 +2695,10 @@ SOURCE=..\include\wx\socket.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
@@ -2535,6 +2715,10 @@ SOURCE=..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sstream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\stack.h
 # End Source File
 # Begin Source File
@@ -2559,6 +2743,14 @@ SOURCE=..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\stdpaths.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\stockitem.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\stopwatch.h
 # End Source File
 # Begin Source File
@@ -2663,6 +2855,10 @@ SOURCE=..\include\wx\types.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\uri.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\url.h
 # End Source File
 # Begin Source File
@@ -2691,6 +2887,10 @@ SOURCE=..\include\wx\vector.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\vidmode.h
 # End Source File
 # Begin Source File
@@ -2731,6 +2931,10 @@ SOURCE=..\include\wx\wx.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\wxchar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -2751,6 +2955,162 @@ SOURCE=..\include\wx\xpmhand.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\xti.h
 # End Source File
 # Begin Source File
@@ -2779,10 +3139,6 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -2795,10 +3151,6 @@ SOURCE=..\include\wx\msw\apptrait.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\bitmap.h
 # End Source File
 # Begin Source File
@@ -2827,6 +3179,10 @@ SOURCE=..\include\wx\msw\checklst.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\chkconf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\choice.h
 # End Source File
 # Begin Source File
@@ -2859,18 +3215,6 @@ SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File
@@ -2911,15 +3255,11 @@ SOURCE=..\include\wx\msw\dragimag.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\dropsrc.h
+SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\enhmeta.h
+SOURCE=..\include\wx\msw\evtloop.h
 # End Source File
 # Begin Source File
 
@@ -2947,31 +3287,31 @@ SOURCE=..\include\wx\msw\gauge95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gdiimage.h
+SOURCE=..\include\wx\msw\gccpriv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gdiobj.h
+SOURCE=..\include\wx\msw\gdiimage.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\glcanvas.h
+SOURCE=..\include\wx\msw\gdiobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gsockmsw.h
+SOURCE=..\include\wx\msw\glcanvas.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpbest.h
+SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpchm.h
+SOURCE=..\include\wx\msw\gsockmsw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpwin.h
+SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 
@@ -3043,10 +3383,42 @@ SOURCE=..\include\wx\msw\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\ole\oleutils.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\palette.h
 # End Source File
 # Begin Source File
@@ -3103,6 +3475,10 @@ SOURCE=..\include\wx\msw\slidrmsw.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\spinbutt.h
 # End Source File
 # Begin Source File
@@ -3171,22 +3547,10 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\uuid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\wave.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File
@@ -3275,6 +3639,10 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
@@ -3386,50 +3754,6 @@ SOURCE=..\include\wx\html\m_templ.h
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 # End Group
-# Begin Group "C-Only"
-
-# PROP Default_Filter ""
-# Begin Group "msw No. 1"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\gccpriv.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\features.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# End Group
 # End Group
 # End Target
 # End Project