X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3a584a7a6ade199990dd4463488e4bbf3545349..0dbfd66d0b35352a0f60e7190b72815052b3d2d4:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 131b2bd436..a4b8d193ad 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -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 @@ -356,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 @@ -444,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 @@ -452,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 @@ -464,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 @@ -552,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 @@ -612,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 @@ -766,6 +786,10 @@ 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 @@ -951,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 @@ -1165,6 +1193,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 @@ -1209,6 +1241,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 @@ -1353,6 +1389,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 @@ -1415,7 +1455,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" @@ -1423,7 +1463,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" @@ -1431,7 +1471,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" @@ -1439,7 +1479,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" @@ -1447,7 +1487,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" @@ -1455,7 +1495,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" @@ -1463,7 +1503,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" @@ -1471,7 +1511,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 @@ -1490,6 +1530,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 @@ -1642,6 +1686,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 @@ -1686,6 +1734,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 @@ -1714,6 +1766,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 @@ -1730,6 +1786,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 @@ -1834,6 +1894,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 @@ -1854,6 +1918,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 @@ -1866,6 +1934,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 @@ -2006,10 +2078,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 @@ -2118,10 +2186,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 @@ -2322,6 +2386,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 @@ -2615,6 +2683,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 @@ -2667,10 +2739,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\slider95.h # End Source File # Begin Source File @@ -2832,10 +2900,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 @@ -2908,6 +2972,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