X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98672b4b9cb156c624a66efd5b3c1935a1d37de9..68c124a1685a951ff9375d23fcc9ba5a6befc31f:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 2c27d62c20..68683ae901 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/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.3 /dll /machine:I386 /out:"../lib/wxmsw250u.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/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 /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.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250ud.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/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.3 /dll /machine:I386 /out:"../lib/wxmsw250.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/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 /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.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw250d.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 @@ -460,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 @@ -472,6 +484,10 @@ 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 @@ -552,6 +568,10 @@ SOURCE=.\common\module.cpp # End Source File # Begin Source File +SOURCE=.\common\msgout.cpp +# End Source File +# Begin Source File + SOURCE=.\common\mstream.cpp # End Source File # Begin Source File @@ -620,6 +640,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 @@ -951,10 +975,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 @@ -1177,6 +1197,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 @@ -1249,6 +1273,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 @@ -1391,7 +1419,6 @@ SOURCE=.\msw\gsockmsw.c # SUBTRACT CPP /YX /Yc /Yu # End Source File -# End Group # Begin Group "OLE Files" # PROP Default_Filter "" @@ -1420,6 +1447,7 @@ SOURCE=.\msw\ole\oleutils.cpp SOURCE=.\msw\ole\uuid.cpp # End Source File +# End Group # End Group # Begin Group "Headers" @@ -1431,67 +1459,67 @@ SOURCE=.\msw\ole\uuid.cpp SOURCE=..\include\wx\msw\setup.h !IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL" -# Begin Custom Build - Creating $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 $(TargetPath) from $(InputPath) +# 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 @@ -1510,6 +1538,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 @@ -1526,6 +1558,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 @@ -1746,6 +1782,10 @@ 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 @@ -1894,6 +1934,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 @@ -1942,10 +1986,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 @@ -1974,6 +2026,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 @@ -2038,6 +2094,10 @@ SOURCE=..\include\wx\msgdlg.h # End Source File # Begin Source File +SOURCE=..\include\wx\msgout.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\mstream.h # End Source File # Begin Source File @@ -2114,6 +2174,10 @@ SOURCE=..\include\wx\proplist.h # End Source File # Begin Source File +SOURCE=..\include\wx\quantize.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\radiobox.h # End Source File # Begin Source File @@ -2651,6 +2715,10 @@ 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 @@ -2872,10 +2940,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 @@ -2888,6 +2952,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 @@ -2936,6 +3004,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