X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fcf087dda560fd1777daf802f2d834c5d9554d9..71110b404c5cbef2175b2be645783e93d9a2b8c4:/src/wxWindows.dsp?ds=sidebyside diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index f2ae4afc27..3064a53fea 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 @@ -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/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" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" @@ -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/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" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -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/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" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" @@ -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/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" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -252,6 +252,14 @@ 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 @@ -344,6 +352,10 @@ SOURCE=.\common\docview.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 @@ -352,6 +364,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 @@ -440,6 +456,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 @@ -448,6 +468,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 @@ -460,10 +484,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 @@ -548,10 +580,6 @@ SOURCE=.\common\object.cpp # End Source File # Begin Source File -SOURCE=.\common\objstrm.cpp -# End Source File -# Begin Source File - SOURCE=.\common\odbc.cpp # End Source File # Begin Source File @@ -608,10 +636,6 @@ SOURCE=.\common\sckstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\serbase.cpp -# End Source File -# Begin Source File - SOURCE=.\common\sizer.cpp # End Source File # Begin Source File @@ -644,6 +668,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 @@ -758,6 +786,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 @@ -939,6 +975,10 @@ SOURCE=.\html\m_pre.cpp # End Source File # Begin Source File +SOURCE=.\html\m_style.cpp +# End Source File +# Begin Source File + SOURCE=.\html\m_tables.cpp # End Source File # Begin Source File @@ -1197,6 +1237,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 @@ -1341,6 +1385,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 @@ -1403,7 +1451,7 @@ SOURCE=..\include\wx\msw\setup.h 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" @@ -1411,7 +1459,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1419,7 +1467,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1427,7 +1475,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1435,7 +1483,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1443,7 +1491,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1451,7 +1499,7 @@ InputPath=..\include\wx\msw\setup.h 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" @@ -1459,7 +1507,7 @@ InputPath=..\include\wx\msw\setup.h 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 @@ -1478,6 +1526,10 @@ 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 @@ -1630,6 +1682,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 @@ -1674,6 +1730,10 @@ 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 @@ -1702,6 +1762,10 @@ 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\encconv.h # End Source File # Begin Source File @@ -1718,6 +1782,10 @@ SOURCE=..\include\wx\fdrepdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\features.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\ffile.h # End Source File # Begin Source File @@ -1822,6 +1890,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 @@ -1842,6 +1914,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 @@ -1854,6 +1930,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 @@ -1950,6 +2030,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 @@ -1990,10 +2074,6 @@ SOURCE=..\include\wx\object.h # End Source File # Begin Source File -SOURCE=..\include\wx\objstrm.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\odbc.h # End Source File # Begin Source File @@ -2018,6 +2098,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 @@ -2098,10 +2182,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 @@ -2198,6 +2278,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 @@ -2298,6 +2382,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 @@ -2503,15 +2591,15 @@ SOURCE=..\include\wx\msw\frame.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gauge.h +SOURCE=..\include\wx\msw\gauge95.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gauge95.h +SOURCE=..\include\wx\msw\gaugemsw.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 @@ -2591,6 +2679,10 @@ 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 @@ -2643,14 +2735,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 @@ -2663,6 +2747,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 @@ -2715,6 +2803,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 @@ -2804,10 +2896,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 @@ -2880,6 +2968,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