X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c8253236f12e86f197f822faa6afc1fcfbb166d..395cb311cf3dd86a69137b18b1027372bda6b914:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 89ad5c8c7e..13b9b44ff2 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -30,8 +30,8 @@ CFG=wxWindows - Win32 Debug # Begin Project # PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "wxWindows" -# PROP Scc_LocalPath ".." +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe @@ -49,7 +49,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 "_MT" /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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -58,8 +58,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw232u.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/wxmsw232u.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" @@ -75,7 +75,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 "_MT" /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 "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -84,8 +84,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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/wxmsw232ud.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/wxmsw232ud.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 /pdbtype:sept /out:"../lib/wxmsw250ud.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.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -99,7 +99,7 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../ReleaseUnicode" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/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 BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -147,7 +147,7 @@ LIB32=link.exe -lib # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 "_MT" /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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -156,8 +156,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw232.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/wxmsw232.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" @@ -173,7 +173,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # 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 "_MT" /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 "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -182,8 +182,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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/wxmsw232d.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/wxmsw232d.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 /pdbtype:sept /out:"../lib/wxmsw250d.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.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -197,7 +197,7 @@ LINK32=link.exe # PROP Output_Dir "../lib" # PROP Intermediate_Dir "../Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W4 /O2 /I "../lib/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 BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -248,10 +248,22 @@ LIB32=link.exe -lib # PROP Default_Filter "" # Begin Source File +SOURCE=.\common\accesscmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\artprov.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\artstd.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -260,6 +272,10 @@ SOURCE=.\common\clipcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\clntdata.cpp +# End Source File +# Begin Source File + SOURCE=.\common\cmdline.cpp # End Source File # Begin Source File @@ -340,6 +356,14 @@ 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 + SOURCE=.\common\dynarray.cpp # End Source File # Begin Source File @@ -348,6 +372,10 @@ SOURCE=.\common\dynlib.cpp # End Source File # Begin Source File +SOURCE=.\common\dynload.cpp +# End Source File +# Begin Source File + SOURCE=.\common\effects.cpp # End Source File # Begin Source File @@ -436,6 +464,10 @@ SOURCE=.\common\hash.cpp # End Source File # Begin Source File +SOURCE=.\common\hashmap.cpp +# End Source File +# Begin Source File + SOURCE=.\common\helpbase.cpp # End Source File # Begin Source File @@ -444,6 +476,10 @@ SOURCE=.\common\http.cpp # End Source File # Begin Source File +SOURCE=.\common\iconbndl.cpp +# End Source File +# Begin Source File + SOURCE=.\common\imagall.cpp # End Source File # Begin Source File @@ -456,10 +492,18 @@ SOURCE=.\common\image.cpp # End Source File # Begin Source File +SOURCE=.\common\imagfill.cpp +# End Source File +# Begin Source File + SOURCE=.\common\imaggif.cpp # End Source File # Begin Source File +SOURCE=.\common\imagiff.cpp +# End Source File +# Begin Source File + SOURCE=.\common\imagjpeg.cpp # End Source File # Begin Source File @@ -532,23 +576,19 @@ SOURCE=.\common\module.cpp # End Source File # Begin Source File -SOURCE=.\common\mstream.cpp -# End Source File -# Begin Source File - -SOURCE=.\common\nbkbase.cpp +SOURCE=.\common\msgout.cpp # End Source File # Begin Source File -SOURCE=.\common\object.cpp +SOURCE=.\common\mstream.cpp # End Source File # Begin Source File -SOURCE=.\common\objstrm.cpp +SOURCE=.\common\nbkbase.cpp # End Source File # Begin Source File -SOURCE=.\common\odbc.cpp +SOURCE=.\common\object.cpp # End Source File # Begin Source File @@ -584,7 +624,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 @@ -604,7 +644,7 @@ SOURCE=.\common\sckstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\serbase.cpp +SOURCE=.\common\settcmn.cpp # End Source File # Begin Source File @@ -616,6 +656,10 @@ SOURCE=.\common\socket.cpp # End Source File # Begin Source File +SOURCE=.\common\statbar.cpp +# End Source File +# Begin Source File + SOURCE=.\common\strconv.cpp # End Source File # Begin Source File @@ -636,6 +680,10 @@ SOURCE=.\common\tbarbase.cpp # End Source File # Begin Source File +SOURCE=.\common\textbuf.cpp +# End Source File +# Begin Source File + SOURCE=.\common\textcmn.cpp # End Source File # Begin Source File @@ -700,10 +748,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 @@ -726,12 +770,6 @@ 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" @@ -750,6 +788,14 @@ SOURCE=.\generic\choicdgg.cpp # End Source File # Begin Source File +SOURCE=.\generic\dcbuffer.cpp +# End Source File +# Begin Source File + +SOURCE=.\generic\dcpsg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\dirctrlg.cpp # End Source File # Begin Source File @@ -790,18 +836,6 @@ 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 -# End Source File -# Begin Source File - SOURCE=.\generic\sashwin.cpp # End Source File # Begin Source File @@ -846,10 +880,6 @@ 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 @@ -923,11 +953,11 @@ SOURCE=.\html\m_list.cpp # End Source File # Begin Source File -SOURCE=.\html\m_meta.cpp +SOURCE=.\html\m_pre.cpp # End Source File # Begin Source File -SOURCE=.\html\m_pre.cpp +SOURCE=.\html\m_style.cpp # End Source File # Begin Source File @@ -1009,10 +1039,6 @@ SOURCE=.\msw\control.cpp # End Source File # Begin Source File -SOURCE=.\msw\curico.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\cursor.cpp # End Source File # Begin Source File @@ -1057,15 +1083,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 @@ -1145,6 +1171,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 @@ -1189,6 +1219,10 @@ SOURCE=.\msw\msgdlg.cpp # End Source File # Begin Source File +SOURCE=.\msw\mslu.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\nativdlg.cpp # End Source File # Begin Source File @@ -1213,6 +1247,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 @@ -1333,6 +1371,10 @@ 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 @@ -1351,12 +1393,15 @@ 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\access.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\ole\automtn.cpp # End Source File # Begin Source File @@ -1380,6 +1425,7 @@ SOURCE=.\msw\ole\oleutils.cpp SOURCE=.\msw\ole\uuid.cpp # End Source File +# End Group # End Group # Begin Group "Headers" @@ -1389,69 +1435,69 @@ SOURCE=.\msw\ole\uuid.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\include\wx\msw\setup0.h +SOURCE=..\include\wx\msw\setup.h !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswu\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswud\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswdll\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\msw\wx\setup.h # End Custom Build !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug" -# Begin Custom Build - Creating wx/setup.h from $(InputPath) -InputPath=..\include\wx\msw\setup0.h +# 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 + copy "$(InputPath)" ..\lib\mswd\wx\setup.h # End Custom Build !ENDIF @@ -1466,10 +1512,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\artprov.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\bitmap.h # End Source File # Begin Source File @@ -1486,6 +1540,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 @@ -1526,10 +1584,18 @@ SOURCE=..\include\wx\clipbrd.h # End Source File # Begin Source File +SOURCE=..\include\wx\clntdata.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\cmdline.h # End Source File # Begin Source File +SOURCE=..\include\wx\cmdproc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\cmndata.h # End Source File # Begin Source File @@ -1578,10 +1644,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 @@ -1614,6 +1676,10 @@ SOURCE=..\include\wx\dc.h # End Source File # Begin Source File +SOURCE=..\include\wx\dcbuffer.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\dcclient.h # End Source File # Begin Source File @@ -1658,10 +1724,18 @@ SOURCE=..\include\wx\dir.h # End Source File # Begin Source File +SOURCE=..\include\wx\dirctrl.h +# End Source File +# Begin Source File + 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 @@ -1686,6 +1760,14 @@ SOURCE=..\include\wx\dynlib.h # End Source File # Begin Source File +SOURCE=..\include\wx\dynload.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\effects.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\encconv.h # End Source File # Begin Source File @@ -1694,11 +1776,11 @@ SOURCE=..\include\wx\event.h # End Source File # Begin Source File -SOURCE=..\include\wx\expr.h +SOURCE=..\include\wx\fdrepdlg.h # End Source File # Begin Source File -SOURCE=..\include\wx\fdrepdlg.h +SOURCE=..\include\wx\features.h # End Source File # Begin Source File @@ -1806,6 +1888,10 @@ SOURCE=..\include\wx\hash.h # End Source File # Begin Source File +SOURCE=..\include\wx\hashmap.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\help.h # End Source File # Begin Source File @@ -1826,6 +1912,10 @@ SOURCE=..\include\wx\icon.h # End Source File # Begin Source File +SOURCE=..\include\wx\iconbndl.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\imagbmp.h # End Source File # Begin Source File @@ -1838,6 +1928,10 @@ SOURCE=..\include\wx\imaggif.h # End Source File # Begin Source File +SOURCE=..\include\wx\imagiff.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\imagjpeg.h # End Source File # Begin Source File @@ -1870,10 +1964,18 @@ 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 @@ -1902,6 +2004,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 @@ -1918,6 +2024,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 @@ -1934,6 +2044,10 @@ SOURCE=..\include\wx\memory.h # End Source File # Begin Source File +SOURCE=..\include\wx\memtext.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\menu.h # End Source File # Begin Source File @@ -1962,23 +2076,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 -# End Source File -# Begin Source File - -SOURCE=..\include\wx\object.h +SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File -SOURCE=..\include\wx\objstrm.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 @@ -2002,6 +2112,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 @@ -2026,15 +2140,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 @@ -2046,15 +2152,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 @@ -2082,10 +2188,6 @@ SOURCE=..\include\wx\scrolwin.h # End Source File # Begin Source File -SOURCE=..\include\wx\serbase.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\settings.h # End Source File # Begin Source File @@ -2182,6 +2284,10 @@ SOURCE=..\include\wx\tbarsmpl.h # End Source File # Begin Source File +SOURCE=..\include\wx\textbuf.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\textctrl.h # End Source File # Begin Source File @@ -2202,10 +2308,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 @@ -2282,6 +2384,10 @@ SOURCE=..\include\wx\version.h # End Source File # Begin Source File +SOURCE=..\include\wx\volume.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\wave.h # End Source File # Begin Source File @@ -2318,10 +2424,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 @@ -2351,6 +2453,10 @@ 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 @@ -2407,14 +2513,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 @@ -2451,10 +2549,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 @@ -2487,15 +2581,11 @@ SOURCE=..\include\wx\msw\frame.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gauge.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\gauge95.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gaugemsw.h +SOURCE=..\include\wx\msw\gccpriv.h # End Source File # Begin Source File @@ -2571,10 +2661,18 @@ 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 +SOURCE=..\include\wx\msw\mslu.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\msvcrt.h # End Source File # Begin Source File @@ -2627,14 +2725,6 @@ SOURCE=..\include\wx\msw\scrolbar.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\settings.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\slider.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\slider95.h # End Source File # Begin Source File @@ -2647,6 +2737,10 @@ SOURCE=..\include\wx\msw\spinbutt.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\spinctrl.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\statbmp.h # End Source File # Begin Source File @@ -2699,6 +2793,10 @@ SOURCE=..\include\wx\msw\tooltip.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\toplevel.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\treectrl.h # End Source File # Begin Source File @@ -2788,10 +2886,6 @@ SOURCE=..\include\wx\generic\helphtml.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helpwxht.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File @@ -2804,6 +2898,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 @@ -2840,6 +2938,10 @@ SOURCE=..\include\wx\generic\scrolwin.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\spinctlg.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\splash.h # End Source File # Begin Source File @@ -2848,6 +2950,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 @@ -2860,6 +2966,10 @@ SOURCE=..\include\wx\generic\textdlgg.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\timer.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\treectlg.h # End Source File # Begin Source File