X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524bb0fad078fe71b6cbe332c1c1a84e02f0e233..cd98317518c3b7bb3a20b438ef586a7b7c952311:/build/msw/wx_core.dsp diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index b0c6201342..c4154513ad 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -1,4 +1,4 @@ -# Microsoft Developer Studio Project File - Name="core" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** @@ -55,18 +55,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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /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" /Fd..\..\lib\vc_dll\wxmswuniv271u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /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" /Fd..\..\lib\vc_dll\wxmswuniv271u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /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 "_UNICODE" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /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 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv271u_core_vc_custom /i "..\..\src\tiff" /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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv271u_core_vc_custom /i "..\..\src\tiff" /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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" -# 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib" +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib" +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" @@ -80,18 +80,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 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv271ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv271ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /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 "__WXDEBUG__" /D "_UNICODE" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /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 "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv271ud_core_vc_custom /i "..\..\src\tiff" /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 "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv271ud_core_vc_custom /i "..\..\src\tiff" /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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug -# 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -105,18 +105,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivdll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv271_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv271_core_vc_custom.pdb /I "..\..\src\tiff" /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 "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 "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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /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 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /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__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv271_core_vc_custom /i "..\..\src\tiff" /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__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv271_core_vc_custom /i "..\..\src\tiff" /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 wxregex.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" @@ -130,18 +130,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv271d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv271d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /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 "__WXDEBUG__" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /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 "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv271d_core_vc_custom /i "..\..\src\tiff" /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 "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv271d_core_vc_custom /i "..\..\src\tiff" /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 wxregexd.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv271d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" @@ -155,18 +155,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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /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" /Fd..\..\lib\vc_dll\wxmsw271u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /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" /Fd..\..\lib\vc_dll\wxmsw271u_core_vc_custom.pdb /I "..\..\src\tiff" /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 "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /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 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /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 "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw271u_core_vc_custom /i "..\..\src\tiff" /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 "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw271u_core_vc_custom /i "..\..\src\tiff" /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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" -# 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib" +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib" +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" @@ -180,18 +180,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 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw271ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw271ud_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "_UNICODE" /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 "__WXDEBUG__" /D "_UNICODE" /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 "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /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 "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw271ud_core_vc_custom /i "..\..\src\tiff" /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 "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw271ud_core_vc_custom /i "..\..\src\tiff" /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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug -# 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug +# 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 odbc32.lib ..\..\lib\vc_dll\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 DLL Release" @@ -205,18 +205,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswdll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw271_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw271_core_vc_custom.pdb /I "..\..\src\tiff" /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 "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /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 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /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__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw271_core_vc_custom /i "..\..\src\tiff" /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__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw271_core_vc_custom /i "..\..\src\tiff" /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 wxregex.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" -# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib" +# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib" +# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib" !ELSEIF "$(CFG)" == "core - Win32 DLL Debug" @@ -230,18 +230,18 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswddll\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw271d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw271d_core_vc_custom.pdb /I "..\..\src\tiff" /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 "__WXDEBUG__" /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 "__WXDEBUG__" /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 "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32 -# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /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 "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw271d_core_vc_custom /i "..\..\src\tiff" /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 "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw271d_core_vc_custom /i "..\..\src\tiff" /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 wxregexd.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug -# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug +# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug +# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw271d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" @@ -255,16 +255,16 @@ LINK32=link.exe # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivu\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" @@ -278,16 +278,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivud\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Universal Release" @@ -301,16 +301,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswuniv\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" @@ -324,16 +324,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivd\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Unicode Release" @@ -347,16 +347,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswu\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" @@ -370,16 +370,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswud\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Release" @@ -393,16 +393,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_msw\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib" !ELSEIF "$(CFG)" == "core - Win32 Debug" @@ -416,16 +416,16 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswd\core" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c -# ADD BASE RSC /l 0x405 -# ADD RSC /l 0x405 +# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib" -# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib" +# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib" +# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib" !ENDIF @@ -456,6 +456,10 @@ SOURCE=..\..\src\common\accesscmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\anidecod.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\appcmn.cpp # End Source File # Begin Source File @@ -484,7 +488,7 @@ SOURCE=..\..\src\common\clipcmn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\clntdata.cpp +SOURCE=..\..\src\common\clrpickercmn.cpp # End Source File # Begin Source File @@ -496,6 +500,14 @@ SOURCE=..\..\src\common\cmndata.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\colourcmn.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\combocmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\containr.cpp # End Source File # Begin Source File @@ -520,6 +532,10 @@ SOURCE=..\..\src\common\dcbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\dcbufcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\dlgcmn.cpp # End Source File # Begin Source File @@ -548,6 +564,12 @@ SOURCE=..\..\src\common\dseldlg.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\dummy.cpp +# ADD BASE CPP /Yc"wx/wxprec.h" +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=..\..\src\common\effects.cpp # End Source File # Begin Source File @@ -556,10 +578,18 @@ SOURCE=..\..\src\common\event.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\evtloopcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\fddlgcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\filepickercmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\fldlgcmn.cpp # End Source File # Begin Source File @@ -568,10 +598,18 @@ SOURCE=..\..\src\common\fontcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\fontenumcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\fontmap.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\fontpickercmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\framecmn.cpp # End Source File # Begin Source File @@ -600,6 +638,10 @@ SOURCE=..\..\src\common\gifdecod.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\graphcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\helpbase.cpp # End Source File # Begin Source File @@ -664,6 +706,10 @@ SOURCE=..\..\src\common\lboxcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\listctrlcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\matrix.cpp # End Source File # Begin Source File @@ -680,10 +726,18 @@ SOURCE=..\..\src\common\nbkbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\overlaycmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\pickerbase.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\popupcmn.cpp # End Source File # Begin Source File @@ -720,6 +774,10 @@ SOURCE=..\..\src\common\statbar.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\stockitem.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\tbarbase.cpp # End Source File # Begin Source File @@ -1300,7 +1358,7 @@ SOURCE=..\..\src\msw\colour.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\combobox.cpp +SOURCE=..\..\src\msw\combo.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1363,7 +1421,7 @@ SOURCE=..\..\src\msw\combobox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\control.cpp +SOURCE=..\..\src\msw\combobox.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1426,39 +1484,7 @@ SOURCE=..\..\src\msw\control.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\cursor.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\data.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\ole\dataobj.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dcclient.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dcmemory.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dcprint.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dcscreen.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dialog.cpp +SOURCE=..\..\src\msw\control.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1521,23 +1547,39 @@ SOURCE=..\..\src\msw\dialog.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\dialup.cpp +SOURCE=..\..\src\msw\cursor.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\dib.cpp +SOURCE=..\..\src\msw\data.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\dirdlg.cpp +SOURCE=..\..\src\msw\ole\dataobj.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\display.cpp +SOURCE=..\..\src\msw\dc.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\dragimag.cpp +SOURCE=..\..\src\msw\dcclient.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\dcmemory.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\dcprint.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\dcscreen.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\dialog.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1600,29 +1642,15 @@ SOURCE=..\..\src\msw\dragimag.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\ole\dropsrc.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\ole\droptgt.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\dummy.cpp -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\enhmeta.cpp +SOURCE=..\..\src\msw\dialup.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\evtloop.cpp +SOURCE=..\..\src\msw\dib.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\fdrepdlg.cpp +SOURCE=..\..\src\msw\dirdlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1685,7 +1713,11 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\filedlg.cpp +SOURCE=..\..\src\msw\display.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\dragimag.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1748,11 +1780,23 @@ SOURCE=..\..\src\msw\filedlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\font.cpp +SOURCE=..\..\src\msw\ole\dropsrc.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\fontdlg.cpp +SOURCE=..\..\src\msw\ole\droptgt.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\enhmeta.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\evtloop.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\fdrepdlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1815,15 +1859,7 @@ SOURCE=..\..\src\msw\fontdlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\fontenum.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\fontutil.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\frame.cpp +SOURCE=..\..\src\msw\filedlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1886,7 +1922,11 @@ SOURCE=..\..\src\msw\frame.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gauge95.cpp +SOURCE=..\..\src\msw\font.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\fontdlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -1949,20 +1989,15 @@ SOURCE=..\..\src\msw\gauge95.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gdiimage.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\src\msw\gdiobj.cpp +SOURCE=..\..\src\msw\fontenum.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\..\src\msw\fontutil.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\helpchm.cpp +SOURCE=..\..\src\msw\frame.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -2025,7 +2060,7 @@ SOURCE=..\..\src\msw\helpchm.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\helpwin.cpp +SOURCE=..\..\src\msw\gauge95.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -2088,70 +2123,35 @@ SOURCE=..\..\src\msw\helpwin.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\icon.cpp +SOURCE=..\..\src\msw\gdiimage.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\imaglist.cpp - -!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(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 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" - - -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" - - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" - -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" - -# PROP Exclude_From_Build 1 - -!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 Unicode Release" - - -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" - +SOURCE=..\..\src\msw\gdiobj.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 Release" +SOURCE=..\..\src\msw\graphics.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\gsockmsw.cpp +# End Source File +# Begin Source File -!ELSEIF "$(CFG)" == "core - Win32 Debug" +SOURCE=..\..\src\msw\helpchm.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\helpwin.cpp +# End Source File +# Begin Source File -!ENDIF +SOURCE=..\..\src\msw\icon.cpp +# End Source File +# Begin Source File +SOURCE=..\..\src\msw\imaglist.cpp # End Source File # Begin Source File @@ -3928,14 +3928,77 @@ SOURCE=..\..\src\msw\uxtheme.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\volume.cpp -# End Source File -# Begin Source File +SOURCE=..\..\src\msw\version.rc -SOURCE=..\..\src\msw\window.cpp -# End Source File -# End Group -# Begin Group "Generic Sources" +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# PROP Exclude_From_Build 1 + +!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 Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# PROP Exclude_From_Build 1 + +!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 + +SOURCE=..\..\src\msw\volume.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\msw\window.cpp +# End Source File +# End Group +# Begin Group "Generic Sources" # PROP Default_Filter "" # Begin Source File @@ -4007,23 +4070,23 @@ SOURCE=..\..\src\generic\busyinfo.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\choicdgg.cpp +SOURCE=..\..\src\generic\buttonbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\colrdlgg.cpp +SOURCE=..\..\src\generic\choicbkg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\dcpsg.cpp +SOURCE=..\..\src\generic\choicdgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\dirctrlg.cpp +SOURCE=..\..\src\generic\clrpickerg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\dirdlgg.cpp +SOURCE=..\..\src\generic\colrdlgg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -4086,11 +4149,19 @@ SOURCE=..\..\src\generic\dirdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\dragimgg.cpp +SOURCE=..\..\src\generic\combog.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\fdrepdlg.cpp +SOURCE=..\..\src\generic\dcpsg.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\generic\dirctrlg.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\generic\dirdlgg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -4153,7 +4224,11 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\filedlgg.cpp +SOURCE=..\..\src\generic\dragimgg.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\generic\fdrepdlg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -4216,7 +4291,7 @@ SOURCE=..\..\src\generic\filedlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\fontdlgg.cpp +SOURCE=..\..\src\generic\filedlgg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -4279,7 +4354,11 @@ SOURCE=..\..\src\generic\fontdlgg.cpp # End Source File # Begin Source File -SOURCE=..\..\src\generic\imaglist.cpp +SOURCE=..\..\src\generic\filepickerg.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\generic\fontdlgg.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -4342,6 +4421,10 @@ SOURCE=..\..\src\generic\imaglist.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\fontpickerg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\listbkg.cpp # End Source File # Begin Source File @@ -4713,6 +4796,14 @@ SOURCE=..\..\src\generic\tipwin.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\toolbkg.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\generic\treebkg.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\treectlg.cpp # End Source File # Begin Source File @@ -5863,7 +5954,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\notebook.cpp +SOURCE=..\..\src\univ\themes\mono.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -5926,7 +6017,7 @@ SOURCE=..\..\src\univ\notebook.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\radiobox.cpp +SOURCE=..\..\src\univ\notebook.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -5989,7 +6080,7 @@ SOURCE=..\..\src\univ\radiobox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\radiobut.cpp +SOURCE=..\..\src\univ\radiobox.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6052,7 +6143,7 @@ SOURCE=..\..\src\univ\radiobut.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrarrow.cpp +SOURCE=..\..\src\univ\radiobut.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6115,7 +6206,7 @@ SOURCE=..\..\src\univ\scrarrow.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrolbar.cpp +SOURCE=..\..\src\univ\scrarrow.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6178,7 +6269,7 @@ SOURCE=..\..\src\univ\scrolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\scrthumb.cpp +SOURCE=..\..\src\univ\scrolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6241,7 +6332,7 @@ SOURCE=..\..\src\univ\scrthumb.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\slider.cpp +SOURCE=..\..\src\univ\scrthumb.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6304,7 +6395,7 @@ SOURCE=..\..\src\univ\slider.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\spinbutt.cpp +SOURCE=..\..\src\univ\slider.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6367,7 +6458,7 @@ SOURCE=..\..\src\univ\spinbutt.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statbmp.cpp +SOURCE=..\..\src\univ\spinbutt.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6430,7 +6521,7 @@ SOURCE=..\..\src\univ\statbmp.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statbox.cpp +SOURCE=..\..\src\univ\statbmp.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6493,7 +6584,7 @@ SOURCE=..\..\src\univ\statbox.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statline.cpp +SOURCE=..\..\src\univ\statbox.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6556,7 +6647,7 @@ SOURCE=..\..\src\univ\statline.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\stattext.cpp +SOURCE=..\..\src\univ\statline.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6619,7 +6710,7 @@ SOURCE=..\..\src\univ\stattext.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\statusbr.cpp +SOURCE=..\..\src\univ\stattext.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6682,7 +6773,7 @@ SOURCE=..\..\src\univ\statusbr.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\textctrl.cpp +SOURCE=..\..\src\univ\statusbr.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6745,7 +6836,7 @@ SOURCE=..\..\src\univ\textctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\theme.cpp +SOURCE=..\..\src\univ\stdrend.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6808,7 +6899,7 @@ SOURCE=..\..\src\univ\theme.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\toolbar.cpp +SOURCE=..\..\src\univ\textctrl.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6871,7 +6962,7 @@ SOURCE=..\..\src\univ\toolbar.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\topluniv.cpp +SOURCE=..\..\src\univ\tglbtn.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6934,7 +7025,7 @@ SOURCE=..\..\src\univ\topluniv.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\themes\win32.cpp +SOURCE=..\..\src\univ\theme.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -6997,7 +7088,7 @@ SOURCE=..\..\src\univ\themes\win32.cpp # End Source File # Begin Source File -SOURCE=..\..\src\univ\winuniv.cpp +SOURCE=..\..\src\univ\toolbar.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" @@ -7058,171 +7149,463 @@ SOURCE=..\..\src\univ\winuniv.cpp !ENDIF # End Source File -# End Group -# Begin Group "Setup Headers" - -# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\src\univ\topluniv.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - -# End Custom Build !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - -# End Custom Build !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -# End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# PROP Exclude_From_Build 1 -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" -# End Custom Build +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# PROP Exclude_From_Build 1 -"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" -# End Custom Build +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h -"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" -# End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h -"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# PROP Exclude_From_Build 1 -"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" -# End Custom Build +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "core - Win32 Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# PROP Exclude_From_Build 1 -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +!ELSEIF "$(CFG)" == "core - Win32 Debug" -# End Custom Build +# PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" +!ENDIF -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# End Source File +# Begin Source File -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +SOURCE=..\..\src\univ\themes\win32.cpp -# End Custom Build +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" -!ELSEIF "$(CFG)" == "core - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h -# End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" -!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h -# End Custom Build +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" -!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" +# PROP Exclude_From_Build 1 -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# PROP Exclude_From_Build 1 + +!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 Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# PROP Exclude_From_Build 1 + +!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 + +SOURCE=..\..\src\univ\winuniv.cpp + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# PROP Exclude_From_Build 1 + +!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 Unicode Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# End Group +# Begin Group "Setup Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h +InputPath=..\include\wx\msw\setup.h "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\setup.h + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h -"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Release" +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h -"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h # End Custom Build -!ELSEIF "$(CFG)" == "core - Win32 Debug" +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +# Begin Custom Build - -"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - # End Custom Build @@ -7243,6 +7626,10 @@ SOURCE=..\..\include\wx\msw\ole\access.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\ole\activex.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\app.h # End Source File # Begin Source File @@ -7295,6 +7682,10 @@ SOURCE=..\..\include\wx\msw\colour.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\combo.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\combobox.h # End Source File # Begin Source File @@ -7319,6 +7710,10 @@ 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 @@ -7367,6 +7762,10 @@ SOURCE=..\..\include\wx\msw\enhmeta.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\evtloop.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\fdrepdlg.h # End Source File # Begin Source File @@ -7395,7 +7794,154 @@ SOURCE=..\..\include\wx\msw\gdiimage.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gdiobj.h +SOURCE=..\..\include\wx\msw\genrcdefs.h + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h + +"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h + +"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw" + cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File @@ -7415,6 +7961,10 @@ SOURCE=..\..\include\wx\msw\helpwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\htmlhelp.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\icon.h # End Source File # Begin Source File @@ -7467,10 +8017,6 @@ SOURCE=..\..\include\wx\msw\msgdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\mslu.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\msvcrt.h # End Source File # Begin Source File @@ -7491,15 +8037,15 @@ SOURCE=..\..\include\wx\msw\pen.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\printdlg.h +SOURCE=..\..\include\wx\msw\popupwin.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\printwin.h +SOURCE=..\..\include\wx\msw\printdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\private.h +SOURCE=..\..\include\wx\msw\printwin.h # End Source File # Begin Source File @@ -7511,7 +8057,7 @@ SOURCE=..\..\include\wx\msw\radiobut.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\regconf.h +SOURCE=..\..\include\wx\msw\rcdefs.h # End Source File # Begin Source File @@ -7519,10 +8065,6 @@ SOURCE=..\..\include\wx\msw\region.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\registry.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\scrolbar.h # End Source File # Begin Source File @@ -7535,10 +8077,6 @@ SOURCE=..\..\include\wx\msw\slider95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\slidrmsw.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\sound.h # End Source File # Begin Source File @@ -7583,10 +8121,6 @@ SOURCE=..\..\include\wx\msw\tbar95.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\tbarmsw.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\textctrl.h # End Source File # Begin Source File @@ -7615,11 +8149,15 @@ SOURCE=..\..\include\wx\msw\ole\uuid.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\window.h +SOURCE=..\..\include\wx\msw\uxtheme.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\uxthemep.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h +SOURCE=..\..\include\wx\msw\window.h # End Source File # End Group # Begin Group "Generic Headers" @@ -7627,10 +8165,30 @@ SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\include\wx\generic\aboutdlgg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\accel.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\animate.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\bmpcbox.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\busyinfo.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\buttonbar.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\calctrl.h # End Source File # Begin Source File @@ -7639,10 +8197,34 @@ SOURCE=..\..\include\wx\generic\choicdgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\clrpickerg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\collpaneg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\generic\colpaneg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\colrdlgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\combo.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 # End Source File # Begin Source File @@ -7667,10 +8249,18 @@ SOURCE=..\..\include\wx\generic\filedlgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\filepickerg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\fontdlgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\fontpickerg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\grid.h # End Source File # Begin Source File @@ -7687,10 +8277,6 @@ SOURCE=..\..\include\wx\generic\helpext.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\imaglist.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\generic\laywin.h # End Source File # Begin Source File @@ -7735,6 +8321,10 @@ SOURCE=..\..\include\wx\generic\progdlgg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\generic\propdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\generic\sashwin.h # End Source File # Begin Source File @@ -7803,6 +8393,10 @@ SOURCE=..\..\include\wx\univ\checklst.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\univ\chkconf.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\univ\choice.h # End Source File # Begin Source File @@ -7911,6 +8505,10 @@ SOURCE=..\..\include\wx\univ\statusbr.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\univ\stdrend.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\univ\textctrl.h # End Source File # Begin Source File @@ -7935,15 +8533,15 @@ SOURCE=..\..\include\wx\univ\window.h # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\html\forcelnk.h +SOURCE=..\..\include\wx\html\helpctrl.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\html\helpctrl.h +SOURCE=..\..\include\wx\html\helpdata.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\html\helpdata.h +SOURCE=..\..\include\wx\html\helpdlg.h # End Source File # Begin Source File @@ -7951,6 +8549,10 @@ SOURCE=..\..\include\wx\html\helpfrm.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\html\helpwnd.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\html\htmlcell.h # End Source File # Begin Source File @@ -7995,6 +8597,10 @@ SOURCE=..\..\include\wx\html\winpars.h # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\include\wx\aboutdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\accel.h # End Source File # Begin Source File @@ -8003,10 +8609,30 @@ SOURCE=..\..\include\wx\access.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\anidecod.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\animate.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\animdecod.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\artprov.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\aui\aui.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\aui\auibook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bitmap.h # End Source File # Begin Source File @@ -8015,6 +8641,10 @@ SOURCE=..\..\include\wx\bmpbuttn.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\bmpcbox.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\bookctrl.h # End Source File # Begin Source File @@ -8051,7 +8681,11 @@ SOURCE=..\..\include\wx\choicdlg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\choice.h +SOURCE=..\..\include\wx\choice.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\choicebk.h # End Source File # Begin Source File @@ -8059,7 +8693,7 @@ SOURCE=..\..\include\wx\clipbrd.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\clntdata.h +SOURCE=..\..\include\wx\clrpicker.h # End Source File # Begin Source File @@ -8071,6 +8705,10 @@ SOURCE=..\..\include\wx\cmndata.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\collpane.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\colordlg.h # End Source File # Begin Source File @@ -8079,6 +8717,10 @@ SOURCE=..\..\include\wx\colour.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\combo.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\combobox.h # End Source File # Begin Source File @@ -8103,6 +8745,18 @@ 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\dbgrid.h # End Source File # Begin Source File @@ -8119,6 +8773,10 @@ SOURCE=..\..\include\wx\dcclient.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\dcgraph.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\dcmemory.h # End Source File # Begin Source File @@ -8139,6 +8797,10 @@ SOURCE=..\..\include\wx\dcscreen.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\debugrpt.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\dialog.h # End Source File # Begin Source File @@ -8159,10 +8821,18 @@ SOURCE=..\..\include\wx\display.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\display_impl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\dnd.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\aui\dockart.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\docmdi.h # End Source File # Begin Source File @@ -8195,6 +8865,14 @@ SOURCE=..\..\include\wx\filedlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\filepicker.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\aui\floatpane.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\fmappriv.h # End Source File # Begin Source File @@ -8211,6 +8889,10 @@ SOURCE=..\..\include\wx\fontenum.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\fontpicker.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\fontutil.h # End Source File # Begin Source File @@ -8219,6 +8901,10 @@ SOURCE=..\..\include\wx\frame.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\aui\framemanager.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\gauge.h # End Source File # Begin Source File @@ -8247,6 +8933,10 @@ SOURCE=..\..\include\wx\glcanvas.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\graphics.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\grid.h # End Source File # Begin Source File @@ -8271,6 +8961,10 @@ SOURCE=..\..\include\wx\htmllbox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\icon.h # End Source File # Begin Source File @@ -8359,6 +9053,10 @@ SOURCE=..\..\include\wx\mdi.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\mediactrl.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\menu.h # End Source File # Begin Source File @@ -8387,6 +9085,14 @@ SOURCE=..\..\include\wx\numdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\odcombo.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\overlay.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\ownerdrw.h # End Source File # Begin Source File @@ -8407,6 +9113,10 @@ SOURCE=..\..\include\wx\pen.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\pickerbase.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\popupwin.h # End Source File # Begin Source File @@ -8427,6 +9137,10 @@ SOURCE=..\..\include\wx\progdlg.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\propdlg.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\ptr_scpd.h # End Source File # Begin Source File @@ -8455,6 +9169,34 @@ SOURCE=..\..\include\wx\renderer.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\richtext\richtextbuffer.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextctrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextformatdlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextstyledlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextstyles.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\richtext\richtextxml.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\sashwin.h # End Source File # Begin Source File @@ -8535,6 +9277,10 @@ SOURCE=..\..\include\wx\tabctrl.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\aui\tabmdi.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\taskbar.h # End Source File # Begin Source File @@ -8567,6 +9313,10 @@ SOURCE=..\..\include\wx\toolbar.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\toolbook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\tooltip.h # End Source File # Begin Source File @@ -8579,6 +9329,10 @@ SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\treebook.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\treectrl.h # End Source File # Begin Source File @@ -8623,10 +9377,230 @@ SOURCE=..\..\include\wx\wizard.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\wupdlock.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\wxhtml.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_all.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_animatctrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_bmp.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_bmpbt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_bmpcbox.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_bttn.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_cald.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_chckb.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_chckl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_choic.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_choicbk.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_clrpicker.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_combo.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_datectrl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_dirpicker.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_dlg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_filepicker.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_fontpicker.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_frame.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_gauge.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_gdctl.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_grid.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_html.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_htmllbox.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_hyperlink.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_listb.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_listbk.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_listc.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_mdi.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_menu.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_notbk.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_odcombo.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_panel.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_radbt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_radbx.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_scrol.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_scwin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_sizer.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_slidr.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_spin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_split.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_statbar.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_stbmp.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_stbox.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_stlin.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_sttxt.h +# End Source File +# Begin Source File + +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_tree.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_treebk.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_unkwn.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_wizrd.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xmlres.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xpmdecod.h # End Source File # Begin Source File