X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca1aac538713735774e797bfeab8e4d4790f8061..31907d03078c41ac09b2ff36267e980c57410f72:/src/wxWindows.dsp diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 0810924b3f..81eb3c1a8f 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/wxmsw25u.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/wxmsw25u.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" @@ -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/wxmsw25ud.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/wxmsw25ud.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" @@ -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/wxmsw25.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/wxmsw25.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" @@ -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/wxmsw25d.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/wxmsw25d.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" @@ -356,6 +356,10 @@ 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 @@ -588,10 +592,6 @@ SOURCE=.\common\object.cpp # End Source File # Begin Source File -SOURCE=.\common\odbc.cpp -# End Source File -# Begin Source File - SOURCE=.\common\paper.cpp # End Source File # Begin Source File @@ -628,6 +628,10 @@ SOURCE=.\common\resource.cpp # End Source File # Begin Source File +SOURCE=.\common\rgncmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\sckaddr.cpp # End Source File # Begin Source File @@ -1065,10 +1069,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 @@ -1113,15 +1113,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 @@ -1674,10 +1674,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 @@ -1766,6 +1762,10 @@ 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 @@ -2058,6 +2058,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 @@ -2122,10 +2126,6 @@ SOURCE=..\include\wx\object.h # End Source File # Begin Source File -SOURCE=..\include\wx\odbc.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\ownerdrw.h # End Source File # Begin Source File @@ -2198,6 +2198,10 @@ SOURCE=..\include\wx\radiobut.h # End Source File # Begin Source File +SOURCE=..\include\wx\rawbmp.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\regex.h # End Source File # Begin Source File @@ -2354,10 +2358,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 @@ -2507,6 +2507,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 @@ -2563,14 +2567,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 @@ -2607,10 +2603,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 @@ -2647,10 +2639,6 @@ SOURCE=..\include\wx\msw\gauge95.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\gaugemsw.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\gccpriv.h # End Source File # Begin Source File