X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fa784572f2324fe246158d8eec9492fac604483..422d306cb3acaebe95a0554754ab8a15f13a1784:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 3064a53fea..82cdd64719 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2,8 +2,8 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=wxWindows - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -26,14 +26,13 @@ CFG=wxWindows - Win32 Debug !MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") !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 # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" @@ -48,18 +47,21 @@ RSC=rc.exe # PROP Intermediate_Dir "../ReleaseUnicodeDll" # PROP Ignore_Export_Lib 0 # 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 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /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 +RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233u.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233u.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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" @@ -74,18 +76,21 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugUnicodeDll" # PROP Ignore_Export_Lib 0 # 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 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /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 +RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -99,8 +104,10 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../ReleaseUnicode" # 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 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /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 BSC32=bscmake.exe @@ -122,8 +129,10 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../DebugUnicode" # 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 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /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 BSC32=bscmake.exe @@ -146,18 +155,21 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "../ReleaseDll" # PROP Ignore_Export_Lib 0 # 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 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /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 +RSC=rc.exe # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /i "../include" /d "NDEBUG" 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233.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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" @@ -172,18 +184,21 @@ LINK32=link.exe # PROP Intermediate_Dir "../DebugDll" # PROP Ignore_Export_Lib 0 # 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 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /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 +RSC=rc.exe # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "../include" /d "_DEBUG" 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.dll" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -197,8 +212,10 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Release" # 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 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /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 BSC32=bscmake.exe @@ -220,8 +237,10 @@ LIB32=link.exe -lib # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Debug" # 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 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /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 BSC32=bscmake.exe @@ -231,6 +250,31 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib\wxmswd.lib" +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info" +# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDebug" +# PROP Intermediate_Dir "ReleaseDebug" +# 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 /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 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib" +# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib" + !ENDIF # Begin Target @@ -243,11 +287,24 @@ LIB32=link.exe -lib # Name "wxWindows - Win32 Debug DLL" # Name "wxWindows - Win32 Release" # Name "wxWindows - Win32 Debug" +# Name "wxWindows - Win32 Release 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 "" # Begin Source File +SOURCE=.\common\accesscmn.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\appbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File @@ -260,6 +317,14 @@ SOURCE=.\common\artstd.cpp # End Source File # Begin Source File +SOURCE=.\common\bmpbase.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\bookctrl.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -304,6 +369,10 @@ SOURCE=.\common\ctrlsub.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 @@ -352,6 +421,10 @@ SOURCE=.\common\docview.cpp # End Source File # Begin Source File +SOURCE=.\common\dpycmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\dseldlg.cpp # End Source File # Begin Source File @@ -380,6 +453,11 @@ SOURCE=.\common\event.cpp # End Source File # Begin Source File +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\common\fddlgcmn.cpp # End Source File # Begin Source File @@ -408,6 +486,14 @@ SOURCE=.\common\filesys.cpp # End Source File # Begin Source File +SOURCE=.\common\fldlgcmn.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\fmapbase.cpp +# End Source File +# Begin Source File + SOURCE=.\common\fontcmn.cpp # End Source File # Begin Source File @@ -440,6 +526,10 @@ SOURCE=.\common\gaugecmn.cpp # End Source File # Begin Source File +SOURCE=.\common\gbsizer.cpp +# End Source File +# Begin Source File + SOURCE=.\common\gdicmn.cpp # End Source File # Begin Source File @@ -520,6 +610,10 @@ SOURCE=.\common\imagxpm.cpp # End Source File # Begin Source File +SOURCE=.\common\init.cpp +# End Source File +# Begin Source File + SOURCE=.\common\intl.cpp # End Source File # Begin Source File @@ -568,19 +662,19 @@ 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\nbkbase.cpp +SOURCE=.\common\mstream.cpp # End Source File # Begin Source File -SOURCE=.\common\object.cpp +SOURCE=.\common\nbkbase.cpp # End Source File # Begin Source File -SOURCE=.\common\odbc.cpp +SOURCE=.\common\object.cpp # End Source File # Begin Source File @@ -616,7 +710,11 @@ SOURCE=.\common\regex.cpp # End Source File # Begin Source File -SOURCE=.\common\resource.cpp +SOURCE=.\common\rendcmn.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\rgncmn.cpp # End Source File # Begin Source File @@ -636,6 +734,10 @@ SOURCE=.\common\sckstrm.cpp # End Source File # Begin Source File +SOURCE=.\common\settcmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\sizer.cpp # End Source File # Begin Source File @@ -644,10 +746,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\stockitem.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\stopwatch.cpp +# End Source File +# Begin Source File + SOURCE=.\common\strconv.cpp # End Source File # Begin Source File @@ -664,6 +778,10 @@ SOURCE=.\common\sysopt.cpp # End Source File # Begin Source File +SOURCE=.\common\taskbarcmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\tbarbase.cpp # End Source File # Begin Source File @@ -700,6 +818,11 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -736,37 +859,27 @@ SOURCE=.\common\wxchar.cpp # End Source File # Begin Source File -SOURCE=.\common\wxexpr.cpp -# End Source File -# Begin Source File - SOURCE=.\common\xpmdecod.cpp # End Source File # Begin Source File -SOURCE=.\common\zipstrm.cpp +SOURCE=.\common\xti.cpp # End Source File # Begin Source File -SOURCE=.\common\zstream.cpp +SOURCE=.\common\xtistrm.cpp # End Source File - # Begin Source File -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\common\xtixml.cpp # End Source File # Begin Source File -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\common\zipstrm.cpp # End Source File - # Begin Source File -SOURCE=.\common\dosyacc.c -# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED" -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\common\zstream.cpp # End Source File # End Group # Begin Group "Generic Files" @@ -782,11 +895,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 @@ -814,10 +927,22 @@ SOURCE=.\generic\gridsel.cpp # End Source File # Begin Source File +SOURCE=.\generic\helpext.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\htmllbox.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\laywin.cpp # End Source File # Begin Source File +SOURCE=.\generic\listbkg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\logg.cpp # End Source File # Begin Source File @@ -830,19 +955,19 @@ SOURCE=.\generic\panelg.cpp # End Source File # Begin Source File -SOURCE=.\generic\progdlgg.cpp +SOURCE=.\generic\printps.cpp # End Source File # Begin Source File -SOURCE=.\generic\prop.cpp +SOURCE=.\generic\prntdlgg.cpp # End Source File # Begin Source File -SOURCE=.\generic\propform.cpp +SOURCE=.\generic\progdlgg.cpp # End Source File # Begin Source File -SOURCE=.\generic\proplist.cpp +SOURCE=.\generic\renderg.cpp # End Source File # Begin Source File @@ -854,6 +979,10 @@ SOURCE=.\generic\scrlwing.cpp # End Source File # Begin Source File +SOURCE=.\generic\selstore.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\spinctlg.cpp # End Source File # Begin Source File @@ -870,10 +999,6 @@ SOURCE=.\generic\statusbr.cpp # End Source File # Begin Source File -SOURCE=.\generic\tbarsmpl.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\textdlgg.cpp # End Source File # Begin Source File @@ -890,13 +1015,16 @@ SOURCE=.\generic\treectlg.cpp # End Source File # Begin Source File -SOURCE=.\generic\treelay.cpp +SOURCE=.\generic\vlbox.cpp # End Source File # Begin Source File -SOURCE=.\generic\wizard.cpp +SOURCE=.\generic\vscroll.cpp # End Source File +# Begin Source File +SOURCE=.\generic\wizard.cpp +# End Source File # End Group # Begin Group "wxHTML Files" @@ -967,10 +1095,6 @@ SOURCE=.\html\m_list.cpp # End Source File # Begin Source File -SOURCE=.\html\m_meta.cpp -# End Source File -# Begin Source File - SOURCE=.\html\m_pre.cpp # End Source File # Begin Source File @@ -985,23 +1109,21 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File - # End Group # Begin Group "MSW Files" # PROP Default_Filter "" # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" +SOURCE=.\msw\accel.cpp # End Source File # Begin Source File -SOURCE=.\msw\accel.cpp +SOURCE=.\msw\app.cpp # End Source File # Begin Source File -SOURCE=.\msw\app.cpp +SOURCE=.\msw\basemsw.cpp # End Source File # Begin Source File @@ -1057,7 +1179,7 @@ SOURCE=.\msw\control.cpp # End Source File # Begin Source File -SOURCE=.\msw\curico.cpp +SOURCE=.\msw\crashrpt.cpp # End Source File # Begin Source File @@ -1105,15 +1227,15 @@ SOURCE=.\msw\dib.cpp # End Source File # Begin Source File -SOURCE=.\msw\dibutils.cpp +SOURCE=.\msw\dir.cpp # End Source File # Begin Source File -SOURCE=.\msw\dir.cpp +SOURCE=.\msw\dirdlg.cpp # End Source File # Begin Source File -SOURCE=.\msw\dirdlg.cpp +SOURCE=.\msw\display.cpp # End Source File # Begin Source File @@ -1121,6 +1243,11 @@ SOURCE=.\msw\dragimag.cpp # End Source File # Begin Source File +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=.\msw\enhmeta.cpp # End Source File # Begin Source File @@ -1173,6 +1300,14 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File +SOURCE=.\msw\gsocket.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\gsockmsw.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1193,6 +1328,10 @@ SOURCE=.\msw\imaglist.cpp # End Source File # Begin Source File +SOURCE=.\msw\iniconf.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\joystick.cpp # End Source File # Begin Source File @@ -1249,6 +1388,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 @@ -1261,7 +1428,7 @@ SOURCE=.\msw\pen.cpp # End Source File # Begin Source File -SOURCE=.\msw\penwin.cpp +SOURCE=.\msw\popupwin.cpp # End Source File # Begin Source File @@ -1293,6 +1460,10 @@ SOURCE=.\msw\registry.cpp # End Source File # Begin Source File +SOURCE=.\msw\renderer.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\scrolbar.cpp # End Source File # Begin Source File @@ -1309,6 +1480,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 @@ -1377,6 +1552,10 @@ SOURCE=.\msw\treectrl.cpp # End Source File # Begin Source File +SOURCE=.\msw\urlmsw.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\utils.cpp # End Source File # Begin Source File @@ -1385,132 +1564,287 @@ SOURCE=.\msw\utilsexc.cpp # End Source File # Begin Source File -SOURCE=.\msw\volume.cpp +SOURCE=.\msw\utilsgui.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\uxtheme.cpp # End Source File # Begin Source File -SOURCE=.\msw\wave.cpp +SOURCE=.\msw\volume.cpp # End Source File # Begin Source File SOURCE=.\msw\window.cpp # End Source File +# End Group +# Begin Group "Other Sources" +# PROP Default_Filter "" # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\xml\xml.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\xrc\xh_bmp.cpp # End Source File +# Begin Source File -# End Group -# Begin Group "OLE Files" +SOURCE=.\xrc\xh_bmpbt.cpp +# End Source File +# Begin Source File -# PROP Default_Filter "" +SOURCE=.\xrc\xh_bttn.cpp +# End Source File # Begin Source File -SOURCE=.\msw\ole\automtn.cpp +SOURCE=.\xrc\xh_cald.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\dataobj.cpp +SOURCE=.\xrc\xh_chckb.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\dropsrc.cpp +SOURCE=.\xrc\xh_chckl.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\droptgt.cpp +SOURCE=.\xrc\xh_choic.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\oleutils.cpp +SOURCE=.\xrc\xh_combo.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\uuid.cpp +SOURCE=.\xrc\xh_dlg.cpp # End Source File +# Begin Source File -# End Group -# Begin Group "Headers" +SOURCE=.\xrc\xh_frame.cpp +# End Source File +# Begin Source File -# PROP Default_Filter "" -# Begin Group "Setup" +SOURCE=.\xrc\xh_gauge.cpp +# End Source File +# Begin Source File -# PROP Default_Filter "" +SOURCE=.\xrc\xh_gdctl.cpp +# End Source File # Begin Source File -SOURCE=..\include\wx\msw\setup.h -!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) -InputPath=..\include\wx\msw\setup.h +SOURCE=.\xrc\xh_html.cpp +# End Source File +# Begin Source File -"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h +SOURCE=.\xrc\xh_listb.cpp +# End Source File +# Begin Source File -# End Custom Build -!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) -InputPath=..\include\wx\msw\setup.h +SOURCE=.\xrc\xh_listc.cpp +# End Source File +# Begin Source File -"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h +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" + +# PROP Default_Filter "" +# Begin Group "Setup" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\include\wx\msw\setup.h + +!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" + +# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" + +# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h + +# End Custom Build -# End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# 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 + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h "../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h "../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h "../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h "../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) + +# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h "../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build + +!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info" + +# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) +InputPath=..\include\wx\msw\setup.h + +"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\lib\msw\wx\setup.h + +# End Custom Build + !ENDIF + # End Source File # End Group # Begin Group "Common" @@ -1522,14 +1856,34 @@ SOURCE=..\include\wx\accel.h # End Source File # Begin Source File +SOURCE=..\include\wx\access.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\afterstd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\apptrait.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\arrstr.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\artprov.h # End Source File # Begin Source File +SOURCE=..\include\wx\beforestd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\bitmap.h # End Source File # Begin Source File @@ -1538,6 +1892,10 @@ SOURCE=..\include\wx\bmpbuttn.h # End Source File # Begin Source File +SOURCE=..\include\wx\bookctrl.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\brush.h # End Source File # Begin Source File @@ -1546,6 +1904,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\busyinfo.h # End Source File # Begin Source File @@ -1582,6 +1944,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 @@ -1646,18 +2012,10 @@ SOURCE=..\include\wx\dataobj.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 -SOURCE=..\include\wx\datetime.inl -# End Source File -# Begin Source File - SOURCE=..\include\wx\datstrm.h # End Source File # Begin Source File @@ -1694,6 +2052,10 @@ SOURCE=..\include\wx\dcmemory.h # End Source File # Begin Source File +SOURCE=..\include\wx\dcmirror.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\dcprint.h # End Source File # Begin Source File @@ -1738,6 +2100,14 @@ SOURCE=..\include\wx\dirdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\display.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\dlimpexp.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\dnd.h # End Source File # Begin Source File @@ -1766,15 +2136,27 @@ SOURCE=..\include\wx\dynload.h # End Source File # Begin Source File +SOURCE=..\include\wx\effects.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File +SOURCE=..\include\wx\encinfo.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\event.h # End Source File # Begin Source File -SOURCE=..\include\wx\expr.h +SOURCE=..\include\wx\evtloop.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\except.h # End Source File # Begin Source File @@ -1814,6 +2196,10 @@ SOURCE=..\include\wx\filesys.h # End Source File # Begin Source File +SOURCE=..\include\wx\fmappriv.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\font.h # End Source File # Begin Source File @@ -1858,6 +2244,10 @@ SOURCE=..\include\wx\gauge.h # End Source File # Begin Source File +SOURCE=..\include\wx\gbsizer.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\gdicmn.h # End Source File # Begin Source File @@ -1894,6 +2284,10 @@ SOURCE=..\include\wx\hashmap.h # End Source File # Begin Source File +SOURCE=..\include\wx\hashset.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\help.h # End Source File # Begin Source File @@ -1910,6 +2304,10 @@ SOURCE=..\include\wx\helpwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\htmllbox.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\icon.h # End Source File # Begin Source File @@ -1918,6 +2316,10 @@ SOURCE=..\include\wx\iconbndl.h # End Source File # Begin Source File +SOURCE=..\include\wx\iconloc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\imagbmp.h # End Source File # Begin Source File @@ -1962,14 +2364,26 @@ SOURCE=..\include\wx\imagxpm.h # End Source File # Begin Source File +SOURCE=..\include\wx\init.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 @@ -1998,6 +2412,14 @@ SOURCE=..\include\wx\list.h # End Source File # Begin Source File +SOURCE=..\include\wx\listbase.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\listbook.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\listbox.h # End Source File # Begin Source File @@ -2014,6 +2436,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\matrix.h # End Source File # Begin Source File @@ -2062,6 +2488,14 @@ SOURCE=..\include\wx\msgdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.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 @@ -2070,11 +2504,11 @@ SOURCE=..\include\wx\notebook.h # End Source File # Begin Source File -SOURCE=..\include\wx\object.h +SOURCE=..\include\wx\numdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\odbc.h +SOURCE=..\include\wx\object.h # End Source File # Begin Source File @@ -2126,15 +2560,31 @@ SOURCE=..\include\wx\progdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\prop.h +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 -SOURCE=..\include\wx\propform.h +SOURCE=..\include\wx\ptr_scpd.h # End Source File # Begin Source File -SOURCE=..\include\wx\proplist.h +SOURCE=..\include\wx\ptr_scpd.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\quantize.h # End Source File # Begin Source File @@ -2146,6 +2596,10 @@ SOURCE=..\include\wx\radiobut.h # End Source File # Begin Source File +SOURCE=..\include\wx\rawbmp.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\regex.h # End Source File # Begin Source File @@ -2154,7 +2608,7 @@ SOURCE=..\include\wx\region.h # End Source File # Begin Source File -SOURCE=..\include\wx\resource.h +SOURCE=..\include\wx\renderer.h # End Source File # Begin Source File @@ -2174,6 +2628,18 @@ SOURCE=..\include\wx\sckstrm.h # End Source File # Begin Source File +SOURCE=..\include\wx\scopeguard.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\scopeguard.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\scrolbar.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\scrolbar.h # End Source File # Begin Source File @@ -2182,6 +2648,10 @@ SOURCE=..\include\wx\scrolwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\selstore.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\settings.h # End Source File # Begin Source File @@ -2202,6 +2672,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 @@ -2218,6 +2692,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 @@ -2242,6 +2720,14 @@ SOURCE=..\include\wx\statusbr.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 + SOURCE=..\include\wx\strconv.h # End Source File # Begin Source File @@ -2274,10 +2760,6 @@ SOURCE=..\include\wx\tbarbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\tbarsmpl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\textbuf.h # End Source File # Begin Source File @@ -2302,10 +2784,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 @@ -2382,10 +2860,26 @@ SOURCE=..\include\wx\version.h # End Source File # Begin Source File +SOURCE=..\include\wx\vidmode.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\vlbox.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\vms_x_fix.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\volume.h # End Source File # Begin Source File +SOURCE=..\include\wx\vscroll.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\wave.h # End Source File # Begin Source File @@ -2406,35 +2900,195 @@ SOURCE=..\include\wx\wx.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw.h +SOURCE=..\include\wx\wxchar.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw_cm.h +SOURCE=..\include\wx\wxhtml.h # End Source File # Begin Source File -SOURCE=..\include\wx\wx_cw_d.h +SOURCE=..\include\wx\wxprec.h # End Source File # Begin Source File -SOURCE=..\include\wx\wxchar.h +SOURCE=..\include\wx\xml\xml.h # End Source File # Begin Source File -SOURCE=..\include\wx\wxexpr.h +SOURCE=..\include\wx\xpmdecod.h # End Source File # Begin Source File -SOURCE=..\include\wx\wxhtml.h +SOURCE=..\include\wx\xpmhand.h # End Source File # Begin Source File -SOURCE=..\include\wx\wxprec.h +SOURCE=..\include\wx\xrc\xh_all.h # End Source File # Begin Source File -SOURCE=..\include\wx\xpmdecod.h +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 + +SOURCE=..\include\wx\xtistrm.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\xtixml.h # End Source File # Begin Source File @@ -2444,7 +3098,6 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File - # End Group # Begin Group "MSW" @@ -2459,6 +3112,14 @@ SOURCE=..\include\wx\msw\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\apptbase.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\apptrait.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\bitmap.h # End Source File # Begin Source File @@ -2487,6 +3148,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 @@ -2511,11 +3176,7 @@ SOURCE=..\include\wx\msw\control.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\curico.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\curicop.h +SOURCE=..\include\wx\msw\crashrpt.h # End Source File # Begin Source File @@ -2555,10 +3216,6 @@ SOURCE=..\include\wx\msw\dib.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\dibutils.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\dirdlg.h # End Source File # Begin Source File @@ -2571,6 +3228,10 @@ SOURCE=..\include\wx\msw\enhmeta.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\evtloop.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\fdrepdlg.h # End Source File # Begin Source File @@ -2595,10 +3256,6 @@ SOURCE=..\include\wx\msw\gauge95.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gaugemsw.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\gccpriv.h # End Source File # Begin Source File @@ -2615,15 +3272,15 @@ 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 @@ -2675,6 +3332,10 @@ SOURCE=..\include\wx\msw\minifram.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\missing.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\msgdlg.h # End Source File # Begin Source File @@ -2691,6 +3352,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 @@ -2735,6 +3432,10 @@ SOURCE=..\include\wx\msw\scrolbar.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\setup0.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\slider95.h # End Source File # Begin Source File @@ -2743,6 +3444,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 @@ -2811,17 +3516,20 @@ SOURCE=..\include\wx\msw\treectrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\wave.h +SOURCE=..\include\wx\msw\window.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\window.h +SOURCE=..\include\wx\msw\winundef.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\winundef.h +SOURCE=..\include\wx\msw\wrapcctl.h # End Source File +# Begin Source File +SOURCE=..\include\wx\msw\wrapwin.h +# End Source File # End Group # Begin Group "Generic" @@ -2836,10 +3544,6 @@ SOURCE=..\include\wx\generic\calctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\caret.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\choicdgg.h # End Source File # Begin Source File @@ -2856,18 +3560,10 @@ SOURCE=..\include\wx\generic\dirctrlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\dirdlgg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\dragimgg.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\fdrepdlg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\filedlgg.h # End Source File # Begin Source File @@ -2884,7 +3580,7 @@ SOURCE=..\include\wx\generic\gridctrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\gridg.h +SOURCE=..\include\wx\generic\gridsel.h # End Source File # Begin Source File @@ -2892,10 +3588,6 @@ SOURCE=..\include\wx\generic\helpext.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File @@ -2904,7 +3596,7 @@ SOURCE=..\include\wx\generic\laywin.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\listctrl.h +SOURCE=..\include\wx\generic\logg.h # End Source File # Begin Source File @@ -2916,7 +3608,7 @@ SOURCE=..\include\wx\generic\notebook.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\paletteg.h +SOURCE=..\include\wx\generic\numdlgg.h # End Source File # Begin Source File @@ -2956,14 +3648,6 @@ SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\statusbr.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\generic\tabg.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\textdlgg.h # End Source File # Begin Source File @@ -2978,7 +3662,6 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File - # End Group # Begin Group "HTML" @@ -3017,6 +3700,10 @@ SOURCE=..\include\wx\html\htmlpars.h # End Source File # Begin Source File +SOURCE=..\include\wx\html\htmlproc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\html\htmltag.h # End Source File # Begin Source File @@ -3035,7 +3722,6 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File - # End Group # End Group # End Target