X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e41db760792a4e666492d77290f4c51e9c5b19..64ac3db840a3b4496131a11817926859b4eab870:/build/msw/wx_core.dsp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index c6ae284ca6..7cd78d10d8 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -47,18 +47,18 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" @@ -72,18 +72,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -97,18 +97,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" @@ -122,18 +122,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw293ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" !ELSEIF "$(CFG)" == "core - Win32 Universal Release" @@ -252,6 +252,10 @@ SOURCE=..\..\src\common\accesscmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\affinematrix2d.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\anidecod.cpp # End Source File # Begin Source File @@ -276,6 +280,10 @@ SOURCE=..\..\src\common\bmpbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\bmpbtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\bookctrl.cpp # End Source File # Begin Source File @@ -288,6 +296,14 @@ SOURCE=..\..\src\common\cairo.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\checkboxcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\checklstcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\choiccmn.cpp # End Source File # Begin Source File @@ -312,6 +328,10 @@ SOURCE=..\..\src\common\colourcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\colourdata.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\combocmn.cpp # End Source File # Begin Source File @@ -332,10 +352,6 @@ SOURCE=..\..\src\common\ctrlsub.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\datacmn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\dcbase.cpp # End Source File # Begin Source File @@ -352,6 +368,10 @@ SOURCE=..\..\src\common\dcsvg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\dirctrlcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\dlgcmn.cpp # End Source File # Begin Source File @@ -418,6 +438,10 @@ SOURCE=..\..\src\common\fontcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\fontdata.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\fontenumcmn.cpp # End Source File # Begin Source File @@ -546,6 +570,10 @@ SOURCE=..\..\src\common\listctrlcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\markupparser.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\matrix.cpp # End Source File # Begin Source File @@ -574,6 +602,10 @@ SOURCE=..\..\src\common\ownerdrwcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\panelcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File @@ -598,6 +630,10 @@ SOURCE=..\..\src\common\quantize.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\radiobtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\radiocmn.cpp # End Source File # Begin Source File @@ -614,6 +650,10 @@ SOURCE=..\..\src\common\rgncmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\scrolbarcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\settcmn.cpp # End Source File # Begin Source File @@ -622,6 +662,14 @@ SOURCE=..\..\src\common\sizer.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\slidercmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\spinbtncmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\spinctrlcmn.cpp # End Source File # Begin Source File @@ -634,6 +682,18 @@ SOURCE=..\..\src\common\statbar.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\statbmpcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\statboxcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\statlinecmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\stattextcmn.cpp # End Source File # Begin Source File @@ -678,6 +738,10 @@ SOURCE=..\..\src\common\validate.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\valnum.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\valtext.cpp # End Source File # Begin Source File @@ -776,6 +840,41 @@ SOURCE=..\..\src\msw\ole\activex.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\anybutton.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\app.cpp # End Source File # Begin Source File @@ -1927,6 +2026,45 @@ SOURCE=..\..\src\msw\nativewin.cpp !ELSEIF "$(CFG)" == "core - Win32 Release" +!ELSEIF "$(CFG)" == "core - Win32 Debug" + + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\nonownedwnd.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\notebook.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + + !ELSEIF "$(CFG)" == "core - Win32 Debug" @@ -1935,7 +2073,11 @@ SOURCE=..\..\src\msw\nativewin.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\notebook.cpp +SOURCE=..\..\src\msw\ole\oleutils.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\ownerdrw.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -1970,11 +2112,11 @@ SOURCE=..\..\src\msw\notebook.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\oleutils.cpp +SOURCE=..\..\src\msw\palette.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ownerdrw.cpp +SOURCE=..\..\src\msw\panel.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2009,10 +2151,6 @@ SOURCE=..\..\src\msw\ownerdrw.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\palette.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\msw\pen.cpp # End Source File # Begin Source File @@ -2680,37 +2818,6 @@ SOURCE=..\..\src\msw\treectrl.cpp # Begin Source File SOURCE=..\..\src\msw\uiaction.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - - -!ENDIF - # End Source File # Begin Source File @@ -3090,6 +3197,10 @@ SOURCE=..\..\src\generic\logg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\markuptext.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\mdig.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -3133,10 +3244,6 @@ SOURCE=..\..\src\generic\numdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\panelg.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\generic\printps.cpp # End Source File # Begin Source File @@ -4814,6 +4921,10 @@ SOURCE=..\..\include\wx\msw\ole\activex.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\anybutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\app.h # End Source File # Begin Source File @@ -4892,34 +5003,42 @@ SOURCE=..\..\include\wx\msw\control.h SOURCE=..\..\include\wx\msw\ctrlsub.h # End Source File -# Begin Source File - -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\cursor.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\custombgwin.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\datectrl.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\dc.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\dcclient.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\datectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\datetimectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\dc.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\dcclient.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\msw\dcmemory.h @@ -5159,18 +5278,22 @@ SOURCE=..\..\include\wx\msw\missing.h SOURCE=..\..\include\wx\msw\msgdlg.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\msvcrt.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\notebook.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\notifmsg.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\msvcrt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\nonownedwnd.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\notebook.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\notifmsg.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\msw\ole\oleutils.h @@ -5185,6 +5308,10 @@ SOURCE=..\..\include\wx\msw\palette.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\pen.h # End Source File # Begin Source File @@ -5279,18 +5406,22 @@ SOURCE=..\..\include\wx\msw\textctrl.h SOURCE=..\..\include\wx\msw\textentry.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\tglbtn.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\toolbar.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\msw\tooltip.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\tglbtn.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\timectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\toolbar.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\tooltip.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\msw\toplevel.h @@ -5313,6 +5444,14 @@ SOURCE=..\..\include\wx\msw\uxthemep.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\webview_ie.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\window.h # End Source File # End Group @@ -5367,18 +5506,22 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h SOURCE=..\..\include\wx\generic\combo.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\ctrlsub.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\dataview.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\datectrl.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\ctrlsub.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\custombgwin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\dataview.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\datectrl.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\generic\dcpsg.h @@ -5551,24 +5694,32 @@ SOURCE=..\..\include\wx\generic\stattextg.h SOURCE=..\..\include\wx\generic\statusbr.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\textdlgg.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\treectlg.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\generic\wizard.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\textdlgg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\timectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\treectlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\wizard.h +# End Source File # End Group # Begin Group "wxUniv Headers" # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\include\wx\univ\anybutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\univ\app.h # End Source File # Begin Source File @@ -5603,18 +5754,22 @@ SOURCE=..\..\include\wx\univ\colschem.h SOURCE=..\..\include\wx\univ\combobox.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\univ\control.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\univ\dialog.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\univ\frame.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\control.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\custombgwin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\dialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\frame.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\univ\gauge.h @@ -5645,6 +5800,10 @@ SOURCE=..\..\include\wx\univ\notebook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\univ\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\univ\radiobox.h # End Source File # Begin Source File @@ -5817,6 +5976,14 @@ SOURCE=..\..\include\wx\propgrid\advprops.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\affinematrix2d.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\affinematrix2dbase.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\anidecod.h # End Source File # Begin Source File @@ -5829,6 +5996,10 @@ SOURCE=..\..\include\wx\animdecod.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\anybutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\ribbon\art.h # End Source File # Begin Source File @@ -5853,6 +6024,10 @@ SOURCE=..\..\include\wx\aui\auibook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\bannerwindow.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\ribbon\bar.h # End Source File # Begin Source File @@ -5869,11 +6044,11 @@ SOURCE=..\..\include\wx\bmpcbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\bookctrl.h +SOURCE=..\..\include\wx\bookctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\bookctrl.h +SOURCE=..\..\include\wx\persist\bookctrl.h # End Source File # Begin Source File @@ -5953,6 +6128,10 @@ SOURCE=..\..\include\wx\colour.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\colourdata.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\combo.h # End Source File # Begin Source File @@ -5983,34 +6162,42 @@ SOURCE=..\..\include\wx\cshelp.h SOURCE=..\..\include\wx\ctrlsub.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\cursor.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\dataobj.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\dataview.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\cursor.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\custombgwin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\dataobj.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\dataview.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\datectrl.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\dateevt.h -# End Source File -# Begin Source File - -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\dateevt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\datetimectrl.h +# End Source File +# Begin Source File + +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 @@ -6149,6 +6336,10 @@ SOURCE=..\..\include\wx\font.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\fontdata.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\fontdlg.h # End Source File # Begin Source File @@ -6305,6 +6496,10 @@ SOURCE=..\..\include\wx\infobar.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\itemid.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\joystick.h # End Source File # Begin Source File @@ -6501,6 +6696,10 @@ SOURCE=..\..\include\wx\radiobut.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\range.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\rawbmp.h # End Source File # Begin Source File @@ -6521,14 +6720,34 @@ SOURCE=..\..\include\wx\richmsgdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbackgroundpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextborderspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextbuffer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbulletspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextdialogpage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextfontpage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextformatdlg.h # End Source File # Begin Source File @@ -6541,32 +6760,60 @@ SOURCE=..\..\include\wx\richtext\richtextimagedlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextindentspage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextliststylepage.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextmarginspage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextprint.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\richtext\richtextstyledlg.h +SOURCE=..\..\include\wx\richtext\richtextsizepage.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\richtext\richtextstyles.h +SOURCE=..\..\include\wx\richtext\richtextstyledlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h +SOURCE=..\..\include\wx\richtext\richtextstylepage.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\richtext\richtextxml.h +SOURCE=..\..\include\wx\richtext\richtextstyles.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\sashwin.h +SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\scopeguard.h +SOURCE=..\..\include\wx\richtext\richtextuicustomization.h # End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextxml.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtooltip.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\sashwin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\scopeguard.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\scrolbar.h @@ -6609,6 +6856,10 @@ SOURCE=..\..\include\wx\splash.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\persist\splitter.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\splitter.h # End Source File # Begin Source File @@ -6653,6 +6904,10 @@ SOURCE=..\..\include\wx\tbarbase.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\textcompleter.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\textctrl.h # End Source File # Begin Source File @@ -6667,18 +6922,22 @@ SOURCE=..\..\include\wx\textentry.h SOURCE=..\..\include\wx\textwrapper.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\tglbtn.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\tipdlg.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\tipwin.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\tglbtn.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\timectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\tipdlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\tipwin.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\ribbon\toolbar.h @@ -6697,11 +6956,11 @@ SOURCE=..\..\include\wx\tooltip.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\toplevel.h +SOURCE=..\..\include\wx\persist\toplevel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\toplevel.h +SOURCE=..\..\include\wx\toplevel.h # End Source File # Begin Source File @@ -6709,11 +6968,11 @@ SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\treebook.h +SOURCE=..\..\include\wx\persist\treebook.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\treebook.h +SOURCE=..\..\include\wx\treebook.h # End Source File # Begin Source File @@ -6721,6 +6980,10 @@ SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\treelist.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\uiaction.h # End Source File # Begin Source File @@ -6733,6 +6996,10 @@ SOURCE=..\..\include\wx\validate.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\valnum.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\valtext.h # End Source File # Begin Source File @@ -6753,11 +7020,19 @@ SOURCE=..\..\include\wx\vscroll.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\window.h +SOURCE=..\..\include\wx\webview.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\webviewarchivehandler.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\persist\window.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\window.h +SOURCE=..\..\include\wx\window.h # End Source File # Begin Source File @@ -6765,6 +7040,10 @@ SOURCE=..\..\include\wx\windowid.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\withimages.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wizard.h # End Source File # Begin Source File @@ -6789,6 +7068,10 @@ SOURCE=..\..\include\wx\xrc\xh_animatctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_bmp.h # End Source File # Begin Source File @@ -6995,18 +7278,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h SOURCE=..\..\include\wx\xrc\xh_text.h # End Source File -# Begin Source File - -SOURCE=..\..\include\wx\xrc\xh_tglbtn.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\xrc\xh_toolb.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\wx\xrc\xh_toolbk.h -# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_tglbtn.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_timectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_toolb.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_toolbk.h +# End Source File # Begin Source File SOURCE=..\..\include\wx\xrc\xh_tree.h