X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/742df99230329b2c072c2adcc27fd3cc541d2833..e1efca652844273c3e8d32c7e5f442b87e455ca7:/build/msw/wx_core.dsp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index b2604f04c8..5b6ecf620f 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\wxmswuniv291u_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\wxmswuniv291u_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=wxmswuniv291u_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=wxmswuniv291u_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\wxmswuniv291u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_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\wxmswuniv291u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_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\wxmswuniv291ud_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\wxmswuniv291ud_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=wxmswuniv291ud_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=wxmswuniv291ud_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\wxmswuniv291ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_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\wxmswuniv291ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_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\wxmsw291u_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\wxmsw291u_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=wxmsw291u_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=wxmsw291u_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\wxmsw291u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_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\wxmsw291u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_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\wxmsw291ud_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\wxmsw291ud_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=wxmsw291ud_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=wxmsw291ud_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\wxmsw291ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_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\wxmsw291ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_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 @@ -268,10 +272,18 @@ SOURCE=..\..\src\common\artstd.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\arttango.cpp +# End Source File +# Begin Source File + 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 @@ -284,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 @@ -308,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 @@ -328,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 @@ -348,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 @@ -414,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 @@ -542,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 @@ -570,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 @@ -594,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 @@ -610,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 @@ -618,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 @@ -630,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 @@ -674,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 @@ -772,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 @@ -2009,6 +2112,41 @@ SOURCE=..\..\src\msw\palette.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\panel.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\pen.cpp # End Source File # Begin Source File @@ -2025,6 +2163,41 @@ SOURCE=..\..\src\msw\printwin.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\progdlg.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\radiobox.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2103,7 +2276,7 @@ SOURCE=..\..\src\msw\renderer.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\scrolbar.cpp +SOURCE=..\..\src\msw\richmsgdlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2138,11 +2311,7 @@ SOURCE=..\..\src\msw\scrolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\settings.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\slider.cpp +SOURCE=..\..\src\msw\scrolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2177,7 +2346,11 @@ SOURCE=..\..\src\msw\slider.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\spinbutt.cpp +SOURCE=..\..\src\msw\settings.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\slider.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2212,7 +2385,7 @@ SOURCE=..\..\src\msw\spinbutt.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\spinctrl.cpp +SOURCE=..\..\src\msw\spinbutt.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2247,7 +2420,7 @@ SOURCE=..\..\src\msw\spinctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statbmp.cpp +SOURCE=..\..\src\msw\spinctrl.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2282,7 +2455,7 @@ SOURCE=..\..\src\msw\statbmp.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statbox.cpp +SOURCE=..\..\src\msw\statbmp.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2317,7 +2490,7 @@ SOURCE=..\..\src\msw\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statline.cpp +SOURCE=..\..\src\msw\statbox.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2352,7 +2525,7 @@ SOURCE=..\..\src\msw\statline.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\stattext.cpp +SOURCE=..\..\src\msw\statline.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2387,7 +2560,7 @@ SOURCE=..\..\src\msw\stattext.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\statusbar.cpp +SOURCE=..\..\src\msw\stattext.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2422,7 +2595,7 @@ SOURCE=..\..\src\msw\statusbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textctrl.cpp +SOURCE=..\..\src\msw\statusbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2457,7 +2630,7 @@ SOURCE=..\..\src\msw\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textentry.cpp +SOURCE=..\..\src\msw\textctrl.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2492,7 +2665,7 @@ SOURCE=..\..\src\msw\textentry.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tglbtn.cpp +SOURCE=..\..\src\msw\textentry.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2527,7 +2700,7 @@ SOURCE=..\..\src\msw\tglbtn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\toolbar.cpp +SOURCE=..\..\src\msw\tglbtn.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2562,15 +2735,7 @@ SOURCE=..\..\src\msw\toolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\tooltip.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\toplevel.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\treectrl.cpp +SOURCE=..\..\src\msw\toolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2605,7 +2770,15 @@ SOURCE=..\..\src\msw\treectrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\uiaction.cpp +SOURCE=..\..\src\msw\tooltip.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\toplevel.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\treectrl.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -2640,6 +2813,10 @@ SOURCE=..\..\src\msw\uiaction.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\uiaction.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\utilsgui.cpp # End Source File # Begin Source File @@ -2969,10 +3146,10 @@ SOURCE=..\..\src\generic\headerctrlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\infobar.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\generic\infobar.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\listbkg.cpp # End Source File # Begin Source File @@ -3016,6 +3193,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" @@ -3052,37 +3233,6 @@ SOURCE=..\..\src\generic\mdig.cpp # Begin Source File SOURCE=..\..\src\generic\msgdlgg.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - # End Source File # Begin Source File @@ -3110,6 +3260,10 @@ SOURCE=..\..\src\generic\renderg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\richmsgdlgg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\scrlwing.cpp # End Source File # Begin Source File @@ -4767,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 @@ -4835,6 +4993,10 @@ SOURCE=..\..\include\wx\msw\combobox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\commandlinkbutton.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\control.h # End Source File # Begin Source File @@ -5054,6 +5216,10 @@ SOURCE=..\..\include\wx\msw\htmlhelp.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\icon.h # End Source File # Begin Source File @@ -5130,6 +5296,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 @@ -5146,6 +5316,10 @@ SOURCE=..\..\include\wx\msw\printwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\progdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\radiobox.h # End Source File # Begin Source File @@ -5162,6 +5336,10 @@ SOURCE=..\..\include\wx\msw\region.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\richmsgdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\scrolbar.h # End Source File # Begin Source File @@ -5450,6 +5628,10 @@ SOURCE=..\..\include\wx\generic\propdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\richmsgdlgg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\sashwin.h # End Source File # Begin Source File @@ -5578,6 +5760,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 @@ -5722,6 +5908,10 @@ SOURCE=..\..\include\wx\html\m_templ.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\html\styleparams.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\html\winpars.h # End Source File # End Group @@ -5746,6 +5936,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 @@ -5758,6 +5956,18 @@ 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 + +SOURCE=..\..\include\wx\ribbon\art_internal.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\artprov.h # End Source File # Begin Source File @@ -5774,6 +5984,10 @@ SOURCE=..\..\include\wx\aui\auibook.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\bar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bitmap.h # End Source File # Begin Source File @@ -5786,11 +6000,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 @@ -5806,6 +6020,10 @@ SOURCE=..\..\include\wx\button.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\buttonbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cairo.h # End Source File # Begin Source File @@ -5866,6 +6084,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 @@ -5874,10 +6096,22 @@ SOURCE=..\..\include\wx\combobox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\commandlinkbutton.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\compositewin.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\control.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\control.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\cshelp.h # End Source File # Begin Source File @@ -6050,6 +6284,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 @@ -6074,6 +6312,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\gallery.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\gauge.h # End Source File # Begin Source File @@ -6302,6 +6544,10 @@ SOURCE=..\..\include\wx\ownerdrw.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\page.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\palette.h # End Source File # Begin Source File @@ -6310,6 +6556,10 @@ SOURCE=..\..\include\wx\panel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\panel.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\paper.h # End Source File # Begin Source File @@ -6390,6 +6640,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 @@ -6406,14 +6660,38 @@ SOURCE=..\..\include\wx\renderer.h # End Source File # Begin Source File +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 @@ -6422,14 +6700,38 @@ SOURCE=..\..\include\wx\richtext\richtexthtml.h # End Source File # Begin Source File +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\richtextsizepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyledlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextstylepage.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextstyles.h # End Source File # Begin Source File @@ -6438,6 +6740,10 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextuicustomization.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\richtext\richtextxml.h # End Source File # Begin Source File @@ -6534,6 +6840,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 @@ -6562,6 +6872,10 @@ SOURCE=..\..\include\wx\tipwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\ribbon\toolbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File @@ -6574,11 +6888,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 @@ -6586,11 +6900,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 @@ -6610,6 +6924,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 @@ -6630,11 +6948,11 @@ SOURCE=..\..\include\wx\vscroll.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\window.h +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 @@ -6706,6 +7024,10 @@ SOURCE=..\..\include\wx\xrc\xh_clrpicker.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_cmdlinkbn.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_collpane.h # End Source File # Begin Source File @@ -6878,6 +7200,10 @@ 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 # End Source File # Begin Source File