X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b763ff43863beb0d416e1f492d4cbbaa915b479d..15d9a04c6877a2f730b679402e6798aaace16e3a:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index f19a8149d2..24dfd870a9 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, @@ -32,8 +32,6 @@ CFG=wxWindows - Win32 Debug # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" @@ -48,18 +46,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" /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\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\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 +75,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" /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\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\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 +103,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" /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 +128,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" /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 +154,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" /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\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\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 +183,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" /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\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\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 +211,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" /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 +236,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" /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 @@ -248,6 +266,14 @@ LIB32=link.exe -lib # 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 @@ -304,6 +330,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 +382,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 +414,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 +447,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 @@ -520,6 +567,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 +619,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 +667,7 @@ SOURCE=.\common\regex.cpp # End Source File # Begin Source File -SOURCE=.\common\resource.cpp +SOURCE=.\common\rgncmn.cpp # End Source File # Begin Source File @@ -636,6 +687,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 @@ -648,6 +703,10 @@ SOURCE=.\common\statbar.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 +723,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 +763,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,10 +804,6 @@ 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 @@ -750,24 +814,6 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File - -# Begin Source File - -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File - -# Begin Source File - -SOURCE=.\common\dosyacc.c -# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED" -# SUBTRACT CPP /YX /Yc /Yu -# End Source File # End Group # Begin Group "Generic Files" @@ -834,23 +880,15 @@ SOURCE=.\generic\progdlgg.cpp # End Source File # Begin Source File -SOURCE=.\generic\prop.cpp -# End Source File -# Begin Source File - -SOURCE=.\generic\propform.cpp -# End Source File -# Begin Source File - -SOURCE=.\generic\proplist.cpp +SOURCE=.\generic\sashwin.cpp # End Source File # Begin Source File -SOURCE=.\generic\sashwin.cpp +SOURCE=.\generic\scrlwing.cpp # End Source File # Begin Source File -SOURCE=.\generic\scrlwing.cpp +SOURCE=.\generic\selstore.cpp # End Source File # Begin Source File @@ -890,13 +928,8 @@ SOURCE=.\generic\treectlg.cpp # End Source File # Begin Source File -SOURCE=.\generic\treelay.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\wizard.cpp # End Source File - # End Group # Begin Group "wxHTML Files" @@ -967,10 +1000,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,18 +1014,44 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File - # End Group # Begin Group "MSW Files" +# PROP Default_Filter "" +# Begin Group "OLE Files" + # PROP Default_Filter "" # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" +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 +# End Group +# Begin Source File + SOURCE=.\msw\accel.cpp # End Source File # Begin Source File @@ -1005,6 +1060,10 @@ SOURCE=.\msw\app.cpp # End Source File # Begin Source File +SOURCE=.\msw\basemsw.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\bitmap.cpp # End Source File # Begin Source File @@ -1057,7 +1116,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 +1164,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 +1180,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 +1237,16 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1269,6 +1343,10 @@ SOURCE=.\msw\penwin.cpp # End Source File # Begin Source File +SOURCE=.\msw\popupwin.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\printdlg.cpp # End Source File # Begin Source File @@ -1389,57 +1467,24 @@ SOURCE=.\msw\utilsexc.cpp # End Source File # Begin Source File -SOURCE=.\msw\volume.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\wave.cpp -# End Source File -# Begin Source File - -SOURCE=.\msw\window.cpp +SOURCE=.\msw\utilsgui.cpp # End Source File - # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\msw\uxtheme.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File - -# End Group -# Begin Group "OLE Files" - -# PROP Default_Filter "" -# 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 +SOURCE=.\msw\volume.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\oleutils.cpp +SOURCE=.\msw\wave.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\uuid.cpp +SOURCE=.\msw\window.cpp # End Source File - # End Group # Begin Group "Headers" @@ -1450,7 +1495,9 @@ SOURCE=.\msw\ole\uuid.cpp # 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 @@ -1458,7 +1505,9 @@ InputPath=..\include\wx\msw\setup.h 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 @@ -1466,7 +1515,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" + # Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1474,7 +1525,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswu\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" + # Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1482,7 +1535,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" + # Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1490,7 +1545,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" + # Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1498,7 +1555,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" + # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1506,7 +1565,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" + # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath) InputPath=..\include\wx\msw\setup.h @@ -1514,7 +1575,9 @@ InputPath=..\include\wx\msw\setup.h copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build + !ENDIF + # End Source File # End Group # Begin Group "Common" @@ -1526,10 +1589,18 @@ 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\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\apptrait.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\artprov.h # End Source File # Begin Source File @@ -1550,6 +1621,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 @@ -1650,10 +1725,6 @@ 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 @@ -1742,6 +1813,10 @@ 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\dnd.h # End Source File # Begin Source File @@ -1770,15 +1845,15 @@ SOURCE=..\include\wx\dynload.h # End Source File # Begin Source File -SOURCE=..\include\wx\encconv.h +SOURCE=..\include\wx\effects.h # End Source File # Begin Source File -SOURCE=..\include\wx\event.h +SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File -SOURCE=..\include\wx\expr.h +SOURCE=..\include\wx\event.h # End Source File # Begin Source File @@ -1818,6 +1893,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 @@ -1906,10 +1985,6 @@ SOURCE=..\include\wx\helpbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\helphtml.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\helpwin.h # End Source File # Begin Source File @@ -1970,6 +2045,10 @@ 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 @@ -2006,6 +2085,10 @@ 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\listbox.h # End Source File # Begin Source File @@ -2022,6 +2105,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 @@ -2070,19 +2157,19 @@ SOURCE=..\include\wx\msgdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\mstream.h +SOURCE=..\include\wx\msgout.h # End Source File # Begin Source File -SOURCE=..\include\wx\notebook.h +SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File -SOURCE=..\include\wx\object.h +SOURCE=..\include\wx\notebook.h # End Source File # Begin Source File -SOURCE=..\include\wx\odbc.h +SOURCE=..\include\wx\object.h # End Source File # Begin Source File @@ -2134,15 +2221,7 @@ SOURCE=..\include\wx\progdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\prop.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\propform.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\proplist.h +SOURCE=..\include\wx\quantize.h # End Source File # Begin Source File @@ -2154,15 +2233,15 @@ SOURCE=..\include\wx\radiobut.h # End Source File # Begin Source File -SOURCE=..\include\wx\regex.h +SOURCE=..\include\wx\rawbmp.h # End Source File # Begin Source File -SOURCE=..\include\wx\region.h +SOURCE=..\include\wx\regex.h # End Source File # Begin Source File -SOURCE=..\include\wx\resource.h +SOURCE=..\include\wx\region.h # End Source File # Begin Source File @@ -2190,6 +2269,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 @@ -2310,10 +2393,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 @@ -2430,10 +2509,6 @@ SOURCE=..\include\wx\wxchar.h # End Source File # Begin Source File -SOURCE=..\include\wx\wxexpr.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\wxhtml.h # End Source File # Begin Source File @@ -2452,7 +2527,6 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File - # End Group # Begin Group "MSW" @@ -2463,10 +2537,22 @@ SOURCE=..\include\wx\msw\accel.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\access.h +# End Source File +# Begin Source File + 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 @@ -2519,14 +2605,6 @@ 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 -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\cursor.h # End Source File # Begin Source File @@ -2563,10 +2641,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 @@ -2603,10 +2677,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 @@ -2833,7 +2903,6 @@ SOURCE=..\include\wx\msw\window.h SOURCE=..\include\wx\msw\winundef.h # End Source File - # End Group # Begin Group "Generic" @@ -2904,10 +2973,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 @@ -2920,6 +2985,10 @@ SOURCE=..\include\wx\generic\listctrl.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\mdig.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\msgdlgg.h # End Source File # Begin Source File @@ -2968,6 +3037,10 @@ SOURCE=..\include\wx\generic\splitter.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\statline.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\statusbr.h # End Source File # Begin Source File @@ -2990,7 +3063,6 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File - # End Group # Begin Group "HTML" @@ -3047,7 +3119,6 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File - # End Group # End Group # End Target