X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d1772009a0efd0cc037084bbc23c8d019d3ce4..789f8e6ad40488d2dd5f5f4d87e195d0f1e23422:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index bcaed873eb..8a3d521ede 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -60,8 +60,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/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" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL" @@ -89,8 +89,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 /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" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode" @@ -168,8 +168,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/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" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL" @@ -197,8 +197,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 /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" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll" !ELSEIF "$(CFG)" == "wxWindows - Win32 Release" @@ -263,7 +263,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "ReleaseDebug" # PROP Target_Dir "" CPP=cl.exe -# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c # ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 @@ -317,6 +317,10 @@ SOURCE=.\common\bmpbase.cpp # End Source File # Begin Source File +SOURCE=.\common\bookctrl.cpp +# End Source File +# Begin Source File + SOURCE=.\common\choiccmn.cpp # End Source File # Begin Source File @@ -843,6 +847,18 @@ SOURCE=.\common\xpmdecod.cpp # End Source File # Begin Source File +SOURCE=.\common\xti.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\xtistrm.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\xtixml.cpp +# End Source File +# Begin Source File + SOURCE=.\common\zipstrm.cpp # End Source File # Begin Source File @@ -907,6 +923,10 @@ SOURCE=.\generic\laywin.cpp # End Source File # Begin Source File +SOURCE=.\generic\listbkg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\logg.cpp # End Source File # Begin Source File @@ -919,6 +939,10 @@ SOURCE=.\generic\panelg.cpp # End Source File # Begin Source File +SOURCE=.\generic\printps.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\progdlgg.cpp # End Source File # Begin Source File @@ -955,10 +979,6 @@ SOURCE=.\generic\statusbr.cpp # End Source File # Begin Source File -SOURCE=.\generic\tbarsmpl.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\textdlgg.cpp # End Source File # Begin Source File @@ -1079,18 +1099,10 @@ SOURCE=.\msw\accel.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\access.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\app.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\automtn.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\basemsw.cpp # End Source File # Begin Source File @@ -1159,10 +1171,6 @@ SOURCE=.\msw\data.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\dataobj.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\dc.cpp # End Source File # Begin Source File @@ -1215,14 +1223,6 @@ SOURCE=.\msw\dragimag.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\dummy.cpp # ADD CPP /Yc"wx/wxprec.h" # End Source File @@ -1370,23 +1370,43 @@ SOURCE=.\msw\notebook.cpp # End Source File # Begin Source File +SOURCE=.\msw\ole\access.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\automtn.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dataobj.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\dropsrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\ole\oleutils.cpp # End Source File # Begin Source File -SOURCE=.\msw\ownerdrw.cpp +SOURCE=.\msw\ole\uuid.cpp # End Source File # Begin Source File -SOURCE=.\msw\palette.cpp +SOURCE=.\msw\ownerdrw.cpp # End Source File # Begin Source File -SOURCE=.\msw\pen.cpp +SOURCE=.\msw\palette.cpp # End Source File # Begin Source File -SOURCE=.\msw\penwin.cpp +SOURCE=.\msw\pen.cpp # End Source File # Begin Source File @@ -1522,10 +1542,6 @@ SOURCE=.\msw\utilsgui.cpp # End Source File # Begin Source File -SOURCE=.\msw\ole\uuid.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\uxtheme.cpp # End Source File # Begin Source File @@ -1698,6 +1714,10 @@ SOURCE=..\include\wx\bmpbuttn.h # End Source File # Begin Source File +SOURCE=..\include\wx\bookctrl.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\brush.h # End Source File # Begin Source File @@ -1962,10 +1982,6 @@ SOURCE=..\include\wx\file.h # End Source File # Begin Source File -SOURCE=..\include\wx\protocol\file.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\fileconf.h # End Source File # Begin Source File @@ -2030,10 +2046,6 @@ SOURCE=..\include\wx\fs_zip.h # End Source File # Begin Source File -SOURCE=..\include\wx\protocol\ftp.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\gauge.h # End Source File # Begin Source File @@ -2074,6 +2086,10 @@ SOURCE=..\include\wx\hashmap.h # End Source File # Begin Source File +SOURCE=..\include\wx\hashset.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\help.h # End Source File # Begin Source File @@ -2094,10 +2110,6 @@ SOURCE=..\include\wx\htmllbox.h # End Source File # Begin Source File -SOURCE=..\include\wx\protocol\http.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\icon.h # End Source File # Begin Source File @@ -2206,6 +2218,10 @@ SOURCE=..\include\wx\listbase.h # End Source File # Begin Source File +SOURCE=..\include\wx\listbook.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\listbox.h # End Source File # Begin Source File @@ -2342,6 +2358,18 @@ SOURCE=..\include\wx\progdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\protocol\file.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\protocol\ftp.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\protocol\http.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\protocol\protocol.h # End Source File # Begin Source File @@ -2350,6 +2378,10 @@ SOURCE=..\include\wx\ptr_scpd.h # End Source File # Begin Source File +SOURCE=..\include\wx\ptr_scpd.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\quantize.h # End Source File # Begin Source File @@ -2398,6 +2430,10 @@ SOURCE=..\include\wx\scopeguard.h # End Source File # Begin Source File +SOURCE=..\include\wx\scopeguard.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\scrolbar.h # End Source File # Begin Source File @@ -2510,10 +2546,6 @@ SOURCE=..\include\wx\tbarbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\tbarsmpl.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\textbuf.h # End Source File # Begin Source File @@ -2674,6 +2706,18 @@ SOURCE=..\include\wx\xpmhand.h # End Source File # Begin Source File +SOURCE=..\include\wx\xti.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\xtistrm.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\xtixml.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\zipstrm.h # End Source File # Begin Source File @@ -2690,15 +2734,15 @@ SOURCE=..\include\wx\msw\accel.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\access.h +SOURCE=..\include\wx\msw\app.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\app.h +SOURCE=..\include\wx\msw\apptbase.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\automtn.h +SOURCE=..\include\wx\msw\apptrait.h # End Source File # Begin Source File @@ -2766,18 +2810,6 @@ SOURCE=..\include\wx\msw\cursor.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\dataform.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dataobj.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\dataobj2.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\dc.h # End Source File # Begin Source File @@ -2818,14 +2850,6 @@ SOURCE=..\include\wx\msw\dragimag.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\dropsrc.h -# End Source File -# Begin Source File - -SOURCE=..\include\wx\msw\ole\droptgt.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\enhmeta.h # End Source File # Begin Source File @@ -2870,6 +2894,10 @@ SOURCE=..\include\wx\msw\glcanvas.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\gnuwin32\winresrc.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\gsockmsw.h # End Source File # Begin Source File @@ -2954,10 +2982,42 @@ SOURCE=..\include\wx\msw\notebook.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\access.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\automtn.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataform.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dataobj2.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\dropsrc.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\ole\droptgt.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\ole\oleutils.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\ole\uuid.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\palette.h # End Source File # Begin Source File @@ -3082,10 +3142,6 @@ SOURCE=..\include\wx\msw\treectrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\ole\uuid.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\wave.h # End Source File # Begin Source File @@ -3094,10 +3150,6 @@ SOURCE=..\include\wx\msw\window.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gnuwin32\winresrc.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\winundef.h # End Source File # Begin Source File @@ -3190,6 +3242,10 @@ SOURCE=..\include\wx\generic\panelg.h # End Source File # Begin Source File +SOURCE=..\include\wx\generic\printps.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\generic\prntdlgg.h # End Source File # Begin Source File