diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index 13a860900a..75c4eb3237 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\adv\ false true - wxmsw29ud_adv - wxmsw29u_adv - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_adv + wxmsw30u_adv + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_advlib.pch vc_mswud\adv\ - $(OutDir)wxmsw29ud_adv.pdb + $(OutDir)wxmsw30ud_adv.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_adv.lib + $(OutDir)wxmsw30ud_adv.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_advlib.pch vc_mswu\adv\ - $(OutDir)wxmsw29u_adv.pdb + $(OutDir)wxmsw30u_adv.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_adv.lib + $(OutDir)wxmsw30u_adv.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_advdll.pch vc_mswuddll\adv\ - $(OutDir)wxmsw295ud_adv_vc_custom.pdb + $(OutDir)wxmsw30ud_adv_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_adv_vc_custom.dll - $(OutDir)wxmsw29ud_adv.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_adv_vc_custom.dll + $(OutDir)wxmsw30ud_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_adv_vc_custom.pdb + $(OutDir)wxmsw30ud_adv_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_advdll.pch vc_mswudll\adv\ - $(OutDir)wxmsw295u_adv_vc_custom.pdb + $(OutDir)wxmsw30u_adv_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_adv_vc_custom.dll - $(OutDir)wxmsw29u_adv.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_adv_vc_custom.dll + $(OutDir)wxmsw30u_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_adv_vc_custom.pdb + $(OutDir)wxmsw30u_adv_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 709f60a69a..6fc31f7ce2 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\aui\ false true - wxmsw29ud_aui - wxmsw29u_aui - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_aui + wxmsw30u_aui + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_auilib.pch vc_mswud\aui\ - $(OutDir)wxmsw29ud_aui.pdb + $(OutDir)wxmsw30ud_aui.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_aui.lib + $(OutDir)wxmsw30ud_aui.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_auilib.pch vc_mswu\aui\ - $(OutDir)wxmsw29u_aui.pdb + $(OutDir)wxmsw30u_aui.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_aui.lib + $(OutDir)wxmsw30u_aui.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_auidll.pch vc_mswuddll\aui\ - $(OutDir)wxmsw295ud_aui_vc_custom.pdb + $(OutDir)wxmsw30ud_aui_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_aui_vc_custom.dll - $(OutDir)wxmsw29ud_aui.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_aui_vc_custom.dll + $(OutDir)wxmsw30ud_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_aui_vc_custom.pdb + $(OutDir)wxmsw30ud_aui_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_auidll.pch vc_mswudll\aui\ - $(OutDir)wxmsw295u_aui_vc_custom.pdb + $(OutDir)wxmsw30u_aui_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_aui_vc_custom.dll - $(OutDir)wxmsw29u_aui.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_aui_vc_custom.dll + $(OutDir)wxmsw30u_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_aui_vc_custom.pdb + $(OutDir)wxmsw30u_aui_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 30480f4fe9..0f402f5226 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\base\ false true - wxbase29ud - wx$(ProjectName)295ud_vc_custom - wxbase29u - wx$(ProjectName)295u_vc_custom + wxbase30ud + wx$(ProjectName)30ud_vc_custom + wxbase30u + wx$(ProjectName)30u_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_baselib.pch vc_mswud\base\ - $(OutDir)wxbase29ud.pdb + $(OutDir)wxbase30ud.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29ud.lib + $(OutDir)wxbase30ud.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_baselib.pch vc_mswu\base\ - $(OutDir)wxbase29u.pdb + $(OutDir)wxbase30u.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29u.lib + $(OutDir)wxbase30u.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_basedll.pch vc_mswuddll\base\ - $(OutDir)wxbase295ud_vc_custom.pdb + $(OutDir)wxbase30ud_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase295ud_vc_custom.dll - $(OutDir)wxbase29ud.lib + $(OutDir)wxbase30ud_vc_custom.dll + $(OutDir)wxbase30ud.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295ud_vc_custom.pdb + $(OutDir)wxbase30ud_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_basedll.pch vc_mswudll\base\ - $(OutDir)wxbase295u_vc_custom.pdb + $(OutDir)wxbase30u_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase295u_vc_custom.dll - $(OutDir)wxbase29u.lib + $(OutDir)wxbase30u_vc_custom.dll + $(OutDir)wxbase30u.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295u_vc_custom.pdb + $(OutDir)wxbase30u_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 4cb486a44c..077b5b6fe6 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\core\ false true - wxmsw29ud_core - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw29u_core - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_core + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_core + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_corelib.pch vc_mswud\core\ - $(OutDir)wxmsw29ud_core.pdb + $(OutDir)wxmsw30ud_core.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_core.lib + $(OutDir)wxmsw30ud_core.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_corelib.pch vc_mswu\core\ - $(OutDir)wxmsw29u_core.pdb + $(OutDir)wxmsw30u_core.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_core.lib + $(OutDir)wxmsw30u_core.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_coredll.pch vc_mswuddll\core\ - $(OutDir)wxmsw295ud_core_vc_custom.pdb + $(OutDir)wxmsw30ud_core_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_core_vc_custom.dll - $(OutDir)wxmsw29ud_core.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_core_vc_custom.dll + $(OutDir)wxmsw30ud_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_core_vc_custom.pdb + $(OutDir)wxmsw30ud_core_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_coredll.pch vc_mswudll\core\ - $(OutDir)wxmsw295u_core_vc_custom.pdb + $(OutDir)wxmsw30u_core_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_core_vc_custom.dll - $(OutDir)wxmsw29u_core.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_core_vc_custom.dll + $(OutDir)wxmsw30u_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_core_vc_custom.pdb + $(OutDir)wxmsw30u_core_vc_custom.pdb MachineX86 true true @@ -1310,4 +1310,4 @@ - + diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index 67480cabee..37e4214668 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\gl\ false true - wxmsw29ud_gl - wxmsw29u_gl - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_gl + wxmsw30u_gl + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_gllib.pch vc_mswud\gl\ - $(OutDir)wxmsw29ud_gl.pdb + $(OutDir)wxmsw30ud_gl.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_gl.lib + $(OutDir)wxmsw30ud_gl.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_gllib.pch vc_mswu\gl\ - $(OutDir)wxmsw29u_gl.pdb + $(OutDir)wxmsw30u_gl.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_gl.lib + $(OutDir)wxmsw30u_gl.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_gldll.pch vc_mswuddll\gl\ - $(OutDir)wxmsw295ud_gl_vc_custom.pdb + $(OutDir)wxmsw30ud_gl_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw29ud_core.lib;wxbase29ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_gl_vc_custom.dll - $(OutDir)wxmsw29ud_gl.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_gl_vc_custom.dll + $(OutDir)wxmsw30ud_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_gl_vc_custom.pdb + $(OutDir)wxmsw30ud_gl_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_gldll.pch vc_mswudll\gl\ - $(OutDir)wxmsw295u_gl_vc_custom.pdb + $(OutDir)wxmsw30u_gl_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw29u_core.lib;wxbase29u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_gl_vc_custom.dll - $(OutDir)wxmsw29u_gl.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_gl_vc_custom.dll + $(OutDir)wxmsw30u_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_gl_vc_custom.pdb + $(OutDir)wxmsw30u_gl_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index ff285b9774..17a0ab5158 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\html\ false true - wxmsw29ud_html - wxmsw29u_html - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_html + wxmsw30u_html + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_htmllib.pch vc_mswud\html\ - $(OutDir)wxmsw29ud_html.pdb + $(OutDir)wxmsw30ud_html.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_html.lib + $(OutDir)wxmsw30ud_html.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_htmllib.pch vc_mswu\html\ - $(OutDir)wxmsw29u_html.pdb + $(OutDir)wxmsw30u_html.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_html.lib + $(OutDir)wxmsw30u_html.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch vc_mswuddll\html\ - $(OutDir)wxmsw295ud_html_vc_custom.pdb + $(OutDir)wxmsw30ud_html_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_html_vc_custom.dll - $(OutDir)wxmsw29ud_html.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_html_vc_custom.dll + $(OutDir)wxmsw30ud_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_html_vc_custom.pdb + $(OutDir)wxmsw30ud_html_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_htmldll.pch vc_mswudll\html\ - $(OutDir)wxmsw295u_html_vc_custom.pdb + $(OutDir)wxmsw30u_html_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_html_vc_custom.dll - $(OutDir)wxmsw29u_html.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_html_vc_custom.dll + $(OutDir)wxmsw30u_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_html_vc_custom.pdb + $(OutDir)wxmsw30u_html_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index b0827291da..a90472a829 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\media\ false true - wxmsw29ud_media - wxmsw29u_media - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_media + wxmsw30u_media + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_medialib.pch vc_mswud\media\ - $(OutDir)wxmsw29ud_media.pdb + $(OutDir)wxmsw30ud_media.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_media.lib + $(OutDir)wxmsw30ud_media.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_medialib.pch vc_mswu\media\ - $(OutDir)wxmsw29u_media.pdb + $(OutDir)wxmsw30u_media.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_media.lib + $(OutDir)wxmsw30u_media.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch vc_mswuddll\media\ - $(OutDir)wxmsw295ud_media_vc_custom.pdb + $(OutDir)wxmsw30ud_media_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_media_vc_custom.dll - $(OutDir)wxmsw29ud_media.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_media_vc_custom.dll + $(OutDir)wxmsw30ud_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_media_vc_custom.pdb + $(OutDir)wxmsw30ud_media_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_mediadll.pch vc_mswudll\media\ - $(OutDir)wxmsw295u_media_vc_custom.pdb + $(OutDir)wxmsw30u_media_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_media_vc_custom.dll - $(OutDir)wxmsw29u_media.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_media_vc_custom.dll + $(OutDir)wxmsw30u_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_media_vc_custom.pdb + $(OutDir)wxmsw30u_media_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index be87f401c7..1559865967 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\net\ false true - wxbase29ud_net - wxbase29u_net - wxbase295ud_$(ProjectName)_vc_custom - wxbase295u_$(ProjectName)_vc_custom + wxbase30ud_net + wxbase30u_net + wxbase30ud_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_netlib.pch vc_mswud\net\ - $(OutDir)wxbase29ud_net.pdb + $(OutDir)wxbase30ud_net.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29ud_net.lib + $(OutDir)wxbase30ud_net.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_netlib.pch vc_mswu\net\ - $(OutDir)wxbase29u_net.pdb + $(OutDir)wxbase30u_net.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29u_net.lib + $(OutDir)wxbase30u_net.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_netdll.pch vc_mswuddll\net\ - $(OutDir)wxbase295ud_net_vc_custom.pdb + $(OutDir)wxbase30ud_net_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase295ud_net_vc_custom.dll - $(OutDir)wxbase29ud_net.lib + wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_net_vc_custom.dll + $(OutDir)wxbase30ud_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295ud_net_vc_custom.pdb + $(OutDir)wxbase30ud_net_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_netdll.pch vc_mswudll\net\ - $(OutDir)wxbase295u_net_vc_custom.pdb + $(OutDir)wxbase30u_net_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxbase295u_net_vc_custom.dll - $(OutDir)wxbase29u_net.lib + wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_net_vc_custom.dll + $(OutDir)wxbase30u_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295u_net_vc_custom.pdb + $(OutDir)wxbase30u_net_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index 2d0109182f..fd89101d86 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\propgrid\ false true - wxmsw29ud_propgrid - wxmsw29u_propgrid - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_propgrid + wxmsw30u_propgrid + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_propgridlib.pch vc_mswud\propgrid\ - $(OutDir)wxmsw29ud_propgrid.pdb + $(OutDir)wxmsw30ud_propgrid.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_propgrid.lib + $(OutDir)wxmsw30ud_propgrid.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_propgridlib.pch vc_mswu\propgrid\ - $(OutDir)wxmsw29u_propgrid.pdb + $(OutDir)wxmsw30u_propgrid.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_propgrid.lib + $(OutDir)wxmsw30u_propgrid.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch vc_mswuddll\propgrid\ - $(OutDir)wxmsw295ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_propgrid_vc_custom.dll - $(OutDir)wxmsw29ud_propgrid.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_propgrid_vc_custom.dll + $(OutDir)wxmsw30ud_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch vc_mswudll\propgrid\ - $(OutDir)wxmsw295u_propgrid_vc_custom.pdb + $(OutDir)wxmsw30u_propgrid_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_propgrid_vc_custom.dll - $(OutDir)wxmsw29u_propgrid.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_propgrid_vc_custom.dll + $(OutDir)wxmsw30u_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_propgrid_vc_custom.pdb + $(OutDir)wxmsw30u_propgrid_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 0adc5965f8..13e2fd6178 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\qa\ false true - wxmsw29ud_qa - wxmsw29u_qa - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_qa + wxmsw30u_qa + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_qalib.pch vc_mswud\qa\ - $(OutDir)wxmsw29ud_qa.pdb + $(OutDir)wxmsw30ud_qa.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_qa.lib + $(OutDir)wxmsw30ud_qa.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_qalib.pch vc_mswu\qa\ - $(OutDir)wxmsw29u_qa.pdb + $(OutDir)wxmsw30u_qa.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_qa.lib + $(OutDir)wxmsw30u_qa.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_qadll.pch vc_mswuddll\qa\ - $(OutDir)wxmsw295ud_qa_vc_custom.pdb + $(OutDir)wxmsw30ud_qa_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;$(OutDir)wxbase29ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_qa_vc_custom.dll - $(OutDir)wxmsw29ud_qa.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_qa_vc_custom.dll + $(OutDir)wxmsw30ud_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_qa_vc_custom.pdb + $(OutDir)wxmsw30ud_qa_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_qadll.pch vc_mswudll\qa\ - $(OutDir)wxmsw295u_qa_vc_custom.pdb + $(OutDir)wxmsw30u_qa_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;$(OutDir)wxbase29u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_qa_vc_custom.dll - $(OutDir)wxmsw29u_qa.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_qa_vc_custom.dll + $(OutDir)wxmsw30u_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_qa_vc_custom.pdb + $(OutDir)wxmsw30u_qa_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 97f36ad13b..6ebc8825c1 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\ribbon\ false true - wxmsw29ud_ribbon - wxmsw29u_ribbon - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_ribbon + wxmsw30u_ribbon + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch vc_mswud\ribbon\ - $(OutDir)wxmsw29ud_ribbon.pdb + $(OutDir)wxmsw30ud_ribbon.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_ribbon.lib + $(OutDir)wxmsw30ud_ribbon.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch vc_mswu\ribbon\ - $(OutDir)wxmsw29u_ribbon.pdb + $(OutDir)wxmsw30u_ribbon.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_ribbon.lib + $(OutDir)wxmsw30u_ribbon.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch vc_mswuddll\ribbon\ - $(OutDir)wxmsw295ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_ribbon_vc_custom.dll - $(OutDir)wxmsw29ud_ribbon.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_ribbon_vc_custom.dll + $(OutDir)wxmsw30ud_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch vc_mswudll\ribbon\ - $(OutDir)wxmsw295u_ribbon_vc_custom.pdb + $(OutDir)wxmsw30u_ribbon_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_ribbon_vc_custom.dll - $(OutDir)wxmsw29u_ribbon.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_ribbon_vc_custom.dll + $(OutDir)wxmsw30u_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_ribbon_vc_custom.pdb + $(OutDir)wxmsw30u_ribbon_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index 28d4905b8e..00a73de0ac 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\richtext\ false true - wxmsw29ud_richtext - wxmsw29u_richtext - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_richtext + wxmsw30u_richtext + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_richtextlib.pch vc_mswud\richtext\ - $(OutDir)wxmsw29ud_richtext.pdb + $(OutDir)wxmsw30ud_richtext.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_richtext.lib + $(OutDir)wxmsw30ud_richtext.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_richtextlib.pch vc_mswu\richtext\ - $(OutDir)wxmsw29u_richtext.pdb + $(OutDir)wxmsw30u_richtext.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_richtext.lib + $(OutDir)wxmsw30u_richtext.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch vc_mswuddll\richtext\ - $(OutDir)wxmsw295ud_richtext_vc_custom.pdb + $(OutDir)wxmsw30ud_richtext_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_richtext_vc_custom.dll - $(OutDir)wxmsw29ud_richtext.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_richtext_vc_custom.dll + $(OutDir)wxmsw30ud_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_richtext_vc_custom.pdb + $(OutDir)wxmsw30ud_richtext_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch vc_mswudll\richtext\ - $(OutDir)wxmsw295u_richtext_vc_custom.pdb + $(OutDir)wxmsw30u_richtext_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_richtext_vc_custom.dll - $(OutDir)wxmsw29u_richtext.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_richtext_vc_custom.dll + $(OutDir)wxmsw30u_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_richtext_vc_custom.pdb + $(OutDir)wxmsw30u_richtext_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 9a36cce803..4888343dd9 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\stc\ false true - wxmsw29ud_stc - wxmsw29u_stc - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_stc + wxmsw30u_stc + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_stclib.pch vc_mswud\stc\ - $(OutDir)wxmsw29ud_stc.pdb + $(OutDir)wxmsw30ud_stc.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_stc.lib + $(OutDir)wxmsw30ud_stc.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_stclib.pch vc_mswu\stc\ - $(OutDir)wxmsw29u_stc.pdb + $(OutDir)wxmsw30u_stc.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_stc.lib + $(OutDir)wxmsw30u_stc.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch vc_mswuddll\stc\ - $(OutDir)wxmsw295ud_stc_vc_custom.pdb + $(OutDir)wxmsw30ud_stc_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_stc_vc_custom.dll - $(OutDir)wxmsw29ud_stc.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_stc_vc_custom.dll + $(OutDir)wxmsw30ud_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_stc_vc_custom.pdb + $(OutDir)wxmsw30ud_stc_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_stcdll.pch vc_mswudll\stc\ - $(OutDir)wxmsw295u_stc_vc_custom.pdb + $(OutDir)wxmsw30u_stc_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_stc_vc_custom.dll - $(OutDir)wxmsw29u_stc.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_stc_vc_custom.dll + $(OutDir)wxmsw30u_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_stc_vc_custom.pdb + $(OutDir)wxmsw30u_stc_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index 7f7981158e..37bd28da75 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\webview\ false true - wxmsw29ud_webview - wxmsw29u_webview - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_webview + wxmsw30u_webview + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_webviewlib.pch vc_mswud\webview\ - $(OutDir)wxmsw29ud_webview.pdb + $(OutDir)wxmsw30ud_webview.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_webview.lib + $(OutDir)wxmsw30ud_webview.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_webviewlib.pch vc_mswu\webview\ - $(OutDir)wxmsw29u_webview.pdb + $(OutDir)wxmsw30u_webview.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_webview.lib + $(OutDir)wxmsw30u_webview.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch vc_mswuddll\webview\ - $(OutDir)wxmsw295ud_webview_vc_custom.pdb + $(OutDir)wxmsw30ud_webview_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_webview_vc_custom.dll - $(OutDir)wxmsw29ud_webview.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_webview_vc_custom.dll + $(OutDir)wxmsw30ud_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_webview_vc_custom.pdb + $(OutDir)wxmsw30ud_webview_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch vc_mswudll\webview\ - $(OutDir)wxmsw295u_webview_vc_custom.pdb + $(OutDir)wxmsw30u_webview_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_webview_vc_custom.dll - $(OutDir)wxmsw29u_webview.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_webview_vc_custom.dll + $(OutDir)wxmsw30u_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_webview_vc_custom.pdb + $(OutDir)wxmsw30u_webview_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index 645afbd18f..ae2af8dab8 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\xml\ false true - wxbase29ud_xml - wxbase29u_xml - wxbase295ud_$(ProjectName)_vc_custom - wxbase295u_$(ProjectName)_vc_custom + wxbase30ud_xml + wxbase30u_xml + wxbase30ud_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_xmllib.pch vc_mswud\xml\ - $(OutDir)wxbase29ud_xml.pdb + $(OutDir)wxbase30ud_xml.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29ud_xml.lib + $(OutDir)wxbase30ud_xml.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_xmllib.pch vc_mswu\xml\ - $(OutDir)wxbase29u_xml.pdb + $(OutDir)wxbase30u_xml.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase29u_xml.lib + $(OutDir)wxbase30u_xml.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch vc_mswuddll\xml\ - $(OutDir)wxbase295ud_xml_vc_custom.pdb + $(OutDir)wxbase30ud_xml_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase295ud_xml_vc_custom.dll - $(OutDir)wxbase29ud_xml.lib + wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_xml_vc_custom.dll + $(OutDir)wxbase30ud_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295ud_xml_vc_custom.pdb + $(OutDir)wxbase30ud_xml_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_xmldll.pch vc_mswudll\xml\ - $(OutDir)wxbase295u_xml_vc_custom.pdb + $(OutDir)wxbase30u_xml_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxbase295u_xml_vc_custom.dll - $(OutDir)wxbase29u_xml.lib + wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_xml_vc_custom.dll + $(OutDir)wxbase30u_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase295u_xml_vc_custom.pdb + $(OutDir)wxbase30u_xml_vc_custom.pdb MachineX86 true true diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 64f6421be2..6cf6aa8be6 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -73,10 +73,10 @@ vc_mswudll\xrc\ false true - wxmsw29ud_xrc - wxmsw29u_xrc - wxmsw295ud_$(ProjectName)_vc_custom - wxmsw295u_$(ProjectName)_vc_custom + wxmsw30ud_xrc + wxmsw30u_xrc + wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_custom @@ -97,7 +97,7 @@ wx/wxprec.h vc_mswud\wxprec_xrclib.pch vc_mswud\xrc\ - $(OutDir)wxmsw29ud_xrc.pdb + $(OutDir)wxmsw30ud_xrc.pdb Level4 true ProgramDatabase @@ -108,7 +108,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29ud_xrc.lib + $(OutDir)wxmsw30ud_xrc.lib true @@ -133,7 +133,7 @@ wx/wxprec.h vc_mswu\wxprec_xrclib.pch vc_mswu\xrc\ - $(OutDir)wxmsw29u_xrc.pdb + $(OutDir)wxmsw30u_xrc.pdb Level4 true ProgramDatabase @@ -144,7 +144,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw29u_xrc.lib + $(OutDir)wxmsw30u_xrc.lib true @@ -171,25 +171,25 @@ wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch vc_mswuddll\xrc\ - $(OutDir)wxmsw295ud_xrc_vc_custom.pdb + $(OutDir)wxmsw30ud_xrc_vc_custom.pdb Level4 true ProgramDatabase - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29ud_html.lib;$(OutDir)wxmsw29ud_adv.lib;$(OutDir)wxmsw29ud_core.lib;$(OutDir)wxbase29ud_xml.lib;$(OutDir)wxbase29ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295ud_xrc_vc_custom.dll - $(OutDir)wxmsw29ud_xrc.lib + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_xrc_vc_custom.dll + $(OutDir)wxmsw30ud_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295ud_xrc_vc_custom.pdb + $(OutDir)wxmsw30ud_xrc_vc_custom.pdb MachineX86 @@ -214,25 +214,25 @@ wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch vc_mswudll\xrc\ - $(OutDir)wxmsw295u_xrc_vc_custom.pdb + $(OutDir)wxmsw30u_xrc_vc_custom.pdb Level4 true ProgramDatabase - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) 0x0409 $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw29u_html.lib;$(OutDir)wxmsw29u_adv.lib;$(OutDir)wxmsw29u_core.lib;$(OutDir)wxbase29u_xml.lib;$(OutDir)wxbase29u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw295u_xrc_vc_custom.dll - $(OutDir)wxmsw29u_xrc.lib + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_xrc_vc_custom.dll + $(OutDir)wxmsw30u_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw295u_xrc_vc_custom.pdb + $(OutDir)wxmsw30u_xrc_vc_custom.pdb MachineX86 true true