X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8255d371b65485b1f36a4cb137beb39ddaf67cf9..c0440c7833f4a7966fac477b1541b085142adaa6:/src/wxBase.dsp?ds=inline diff --git a/src/wxBase.dsp b/src/wxBase.dsp index bcc38cda8e..96a16adcf2 100644 --- a/src/wxBase.dsp +++ b/src/wxBase.dsp @@ -48,7 +48,7 @@ CFG=wxBase - Win32 Debug # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedllu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -59,8 +59,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 /nologo /dll /machine:I386 /out:"../lib/wxbase233u.dll" -# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233u.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 /nologo /dll /machine:I386 /out:"../lib/wxbase250u.dll" +# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib gdi32.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250u.dll" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug Unicode DLL" @@ -77,7 +77,7 @@ LINK32=link.exe # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedllud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -88,8 +88,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 /nologo /dll /debug /machine:I386 /out:"../lib/wxbase233ud.dll" /pdbtype:sept -# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.2 /dll /debug /machine:I386 /out:"../lib/wxbase233ud.dll" /pdbtype:sept +# 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 /nologo /dll /debug /machine:I386 /out:"../lib/wxbase250ud.dll" /pdbtype:sept +# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib gdi32.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250ud.dll" !ELSEIF "$(CFG)" == "wxBase - Win32 Release Unicode" @@ -105,7 +105,7 @@ LINK32=link.exe # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/baseu" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -130,7 +130,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /D "_UNICODE" /D "UNICODE" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/baseud" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -156,7 +156,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/basedll" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D "WXMAKINGDLL" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -167,8 +167,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 /nologo /dll /machine:I386 /out:"../lib/wxbase233.dll" -# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxbase233.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 /nologo /dll /machine:I386 /out:"../lib/wxbase250.dll" +# ADD LINK32 ../lib/zlib.lib ../lib/regex.lib kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib gdi32.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250.dll" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug DLL" @@ -185,7 +185,7 @@ LINK32=link.exe # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/basedlld" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D "WXMAKINGDLL" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -196,8 +196,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 /nologo /dll /debug /machine:I386 /out:"../lib/wxbase233d.dll" /pdbtype:sept -# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib wsock32.lib shell32.lib /nologo /version:2.2 /dll /debug /machine:I386 /out:"../lib/wxbase233d.dll" /pdbtype:sept +# 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 /nologo /dll /debug /machine:I386 /out:"../lib/wxbase250d.dll" /pdbtype:sept +# ADD LINK32 ../lib/zlibd.lib ../lib/regexd.lib kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib gdi32.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxbase250d.dll" !ELSEIF "$(CFG)" == "wxBase - Win32 Release" @@ -213,7 +213,7 @@ LINK32=link.exe # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /O2 /I "../lib/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /O2 /I "../lib/base" /I "../include" /I "./regex" /I "./zlib" /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -238,7 +238,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "WIN32" /D "__WXDEBUG__" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/based" /I "../include" /I "./regex" /I "./zlib" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /D "WIN32" /D WINVER=0x400 /Yu"wx/wxprec.h" /FD /c RSC=rc.exe # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -266,7 +266,7 @@ LIB32=link.exe -lib # PROP Default_Filter "" # Begin Source File -SOURCE=.\common\appcmn.cpp +SOURCE=.\common\appbase.cpp # End Source File # Begin Source File @@ -351,7 +351,7 @@ SOURCE=.\common\filesys.cpp # End Source File # Begin Source File -SOURCE=.\common\fontmap.cpp +SOURCE=.\common\fmapbase.cpp # End Source File # Begin Source File @@ -463,6 +463,10 @@ SOURCE=.\common\socket.cpp # End Source File # Begin Source File +SOURCE=.\common\stopwatch.cpp +# End Source File +# Begin Source File + SOURCE=.\common\strconv.cpp # End Source File # Begin Source File @@ -487,10 +491,6 @@ SOURCE=.\common\textfile.cpp # End Source File # Begin Source File -SOURCE=.\common\timercmn.cpp -# End Source File -# Begin Source File - SOURCE=.\common\tokenzr.cpp # End Source File # Begin Source File @@ -536,6 +536,10 @@ SOURCE=.\common\zstream.cpp # PROP Default_Filter "" # Begin Source File +SOURCE=.\msw\basemsw.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\dde.cpp # End Source File # Begin Source File @@ -567,6 +571,10 @@ SOURCE=.\msw\mimetype.cpp # End Source File # Begin Source File +SOURCE=.\msw\mslu.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\regconf.cpp # End Source File # Begin Source File @@ -697,6 +705,10 @@ SOURCE=..\include\wx\app.h # End Source File # Begin Source File +SOURCE=..\include\wx\apptrait.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\buffer.h # End Source File # Begin Source File @@ -725,10 +737,6 @@ SOURCE=..\include\wx\config.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 @@ -745,6 +753,10 @@ SOURCE=..\include\wx\db.h # End Source File # Begin Source File +SOURCE=..\include\wx\dbkeyg.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\dbtable.h # End Source File # Begin Source File @@ -813,6 +825,10 @@ SOURCE=..\include\wx\filesys.h # End Source File # Begin Source File +SOURCE=..\include\wx\fmappriv.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\fontenc.h # End Source File # Begin Source File @@ -849,6 +865,10 @@ 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 @@ -881,6 +901,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\memconf.h # End Source File # Begin Source File @@ -973,10 +997,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 @@ -1041,10 +1061,22 @@ SOURCE=..\include\wx\zstream.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\include\wx\msw\apptbase.h +# End Source File +# Begin Source File + +SOURCE=..\include\wx\msw\apptrait.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\dde.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\gccpriv.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\mimetype.h # End Source File # Begin Source File