diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index 76760d4a97..6d0904c6f5 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_adv - wxmsw30ud_adv - wxmsw30u_adv - wxmsw30u_adv - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_adv + wxmsw31ud_adv + wxmsw31u_adv + wxmsw31u_adv + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_advlib.pch - $(OutDir)wxmsw30ud_adv.pdb + $(OutDir)wxmsw31ud_adv.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_adv.lib + $(OutDir)wxmsw31ud_adv.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_advlib.pch - $(OutDir)wxmsw30ud_adv.pdb + $(OutDir)wxmsw31ud_adv.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_adv.lib + $(OutDir)wxmsw31ud_adv.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_advlib.pch - $(OutDir)wxmsw30u_adv.pdb + $(OutDir)wxmsw31u_adv.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_adv.lib + $(OutDir)wxmsw31u_adv.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_advlib.pch - $(OutDir)wxmsw30u_adv.pdb + $(OutDir)wxmsw31u_adv.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_adv.lib + $(OutDir)wxmsw31u_adv.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_advdll.pch - $(OutDir)wxmsw30ud_adv_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_adv_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_adv_vc_custom.dll + $(OutDir)wxmsw31ud_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_adv_vc_custom.pdb + $(OutDir)wxmsw310ud_adv_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_advdll.pch - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_adv_vc_x64_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=wxmsw30ud_adv_vc_x64_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=wxmsw310ud_adv_vc_x64_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_adv_vc_x64_custom.dll + $(OutDir)wxmsw31ud_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_adv_vc_x64_custom.pdb $(OutDir)wx_vc9_adv.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_advdll.pch - $(OutDir)wxmsw30u_adv_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_adv_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_adv_vc_custom.dll + $(OutDir)wxmsw31u_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_adv_vc_custom.pdb + $(OutDir)wxmsw310u_adv_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_advdll.pch - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + $(OutDir)wxmsw310u_adv_vc_x64_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=wxmsw30u_adv_vc_x64_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=wxmsw310u_adv_vc_x64_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_adv_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_adv_vc_x64_custom.dll + $(OutDir)wxmsw31u_adv.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + $(OutDir)wxmsw310u_adv_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 642cef4a98..ccf05b3fcb 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_aui - wxmsw30ud_aui - wxmsw30u_aui - wxmsw30u_aui - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_aui + wxmsw31ud_aui + wxmsw31u_aui + wxmsw31u_aui + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_auilib.pch - $(OutDir)wxmsw30ud_aui.pdb + $(OutDir)wxmsw31ud_aui.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_aui.lib + $(OutDir)wxmsw31ud_aui.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_auilib.pch - $(OutDir)wxmsw30ud_aui.pdb + $(OutDir)wxmsw31ud_aui.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_aui.lib + $(OutDir)wxmsw31ud_aui.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_auilib.pch - $(OutDir)wxmsw30u_aui.pdb + $(OutDir)wxmsw31u_aui.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_aui.lib + $(OutDir)wxmsw31u_aui.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_auilib.pch - $(OutDir)wxmsw30u_aui.pdb + $(OutDir)wxmsw31u_aui.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_aui.lib + $(OutDir)wxmsw31u_aui.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_auidll.pch - $(OutDir)wxmsw30ud_aui_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_aui_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_aui_vc_custom.dll + $(OutDir)wxmsw31ud_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_aui_vc_custom.pdb + $(OutDir)wxmsw310ud_aui_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_auidll.pch - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_aui_vc_x64_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=wxmsw30ud_aui_vc_x64_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=wxmsw310ud_aui_vc_x64_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_aui_vc_x64_custom.dll + $(OutDir)wxmsw31ud_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_aui_vc_x64_custom.pdb $(OutDir)wx_vc9_aui.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_auidll.pch - $(OutDir)wxmsw30u_aui_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_aui_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_aui_vc_custom.dll + $(OutDir)wxmsw31u_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_aui_vc_custom.pdb + $(OutDir)wxmsw310u_aui_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_auidll.pch - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + $(OutDir)wxmsw310u_aui_vc_x64_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=wxmsw30u_aui_vc_x64_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=wxmsw310u_aui_vc_x64_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_aui_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_aui_vc_x64_custom.dll + $(OutDir)wxmsw31u_aui.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + $(OutDir)wxmsw310u_aui_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 752dc82712..1a0d7f3f96 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -133,14 +133,14 @@ false true true - wxbase30ud - wxbase30ud - wx$(ProjectName)30ud_vc_custom - wx$(ProjectName)30ud_vc_x64_custom - wxbase30u - wxbase30u - wx$(ProjectName)30u_vc_custom - wx$(ProjectName)30u_vc_x64_custom + wxbase31ud + wxbase31ud + wx$(ProjectName)310ud_vc_custom + wx$(ProjectName)310ud_vc_x64_custom + wxbase31u + wxbase31u + wx$(ProjectName)310u_vc_custom + wx$(ProjectName)310u_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_baselib.pch - $(OutDir)wxbase30ud.pdb + $(OutDir)wxbase31ud.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud.lib + $(OutDir)wxbase31ud.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_baselib.pch - $(OutDir)wxbase30ud.pdb + $(OutDir)wxbase31ud.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud.lib + $(OutDir)wxbase31ud.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_baselib.pch - $(OutDir)wxbase30u.pdb + $(OutDir)wxbase31u.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u.lib + $(OutDir)wxbase31u.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_baselib.pch - $(OutDir)wxbase30u.pdb + $(OutDir)wxbase31u.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u.lib + $(OutDir)wxbase31u.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_basedll.pch - $(OutDir)wxbase30ud_vc_custom.pdb + $(OutDir)wxbase310ud_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=wxbase30ud_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=wxbase310ud_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)wxbase30ud_vc_custom.dll - $(OutDir)wxbase30ud.lib + $(OutDir)wxbase310ud_vc_custom.dll + $(OutDir)wxbase31ud.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_vc_custom.pdb + $(OutDir)wxbase310ud_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_basedll.pch - $(OutDir)wxbase30ud_vc_x64_custom.pdb + $(OutDir)wxbase310ud_vc_x64_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=wxbase30ud_vc_x64_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=wxbase310ud_vc_x64_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)wxbase30ud_vc_x64_custom.dll - $(OutDir)wxbase30ud.lib + $(OutDir)wxbase310ud_vc_x64_custom.dll + $(OutDir)wxbase31ud.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_vc_x64_custom.pdb + $(OutDir)wxbase310ud_vc_x64_custom.pdb $(OutDir)wx_vc9_base.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_basedll.pch - $(OutDir)wxbase30u_vc_custom.pdb + $(OutDir)wxbase310u_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=wxbase30u_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=wxbase310u_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)wxbase30u_vc_custom.dll - $(OutDir)wxbase30u.lib + $(OutDir)wxbase310u_vc_custom.dll + $(OutDir)wxbase31u.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_vc_custom.pdb + $(OutDir)wxbase310u_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_basedll.pch - $(OutDir)wxbase30u_vc_x64_custom.pdb + $(OutDir)wxbase310u_vc_x64_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=wxbase30u_vc_x64_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=wxbase310u_vc_x64_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)wxbase30u_vc_x64_custom.dll - $(OutDir)wxbase30u.lib + $(OutDir)wxbase310u_vc_x64_custom.dll + $(OutDir)wxbase31u.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_vc_x64_custom.pdb + $(OutDir)wxbase310u_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 294d801af4..012a482457 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_core - wxmsw30ud_core - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_core - wxmsw30u_core - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_core + wxmsw31ud_core + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw31u_core + wxmsw31u_core + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_corelib.pch - $(OutDir)wxmsw30ud_core.pdb + $(OutDir)wxmsw31ud_core.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_core.lib + $(OutDir)wxmsw31ud_core.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_corelib.pch - $(OutDir)wxmsw30ud_core.pdb + $(OutDir)wxmsw31ud_core.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_core.lib + $(OutDir)wxmsw31ud_core.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_corelib.pch - $(OutDir)wxmsw30u_core.pdb + $(OutDir)wxmsw31u_core.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_core.lib + $(OutDir)wxmsw31u_core.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_corelib.pch - $(OutDir)wxmsw30u_core.pdb + $(OutDir)wxmsw31u_core.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_core.lib + $(OutDir)wxmsw31u_core.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_coredll.pch - $(OutDir)wxmsw30ud_core_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_core_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_core_vc_custom.dll + $(OutDir)wxmsw31ud_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_core_vc_custom.pdb + $(OutDir)wxmsw310ud_core_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_coredll.pch - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_core_vc_x64_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=wxmsw30ud_core_vc_x64_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=wxmsw310ud_core_vc_x64_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_core_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_core_vc_x64_custom.dll + $(OutDir)wxmsw31ud_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_core_vc_x64_custom.pdb $(OutDir)wx_vc9_core.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_coredll.pch - $(OutDir)wxmsw30u_core_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_core_vc_custom.dll - $(OutDir)wxmsw30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_core_vc_custom.dll + $(OutDir)wxmsw31u_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_core_vc_custom.pdb + $(OutDir)wxmsw310u_core_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_coredll.pch - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + $(OutDir)wxmsw310u_core_vc_x64_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=wxmsw30u_core_vc_x64_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=wxmsw310u_core_vc_x64_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_core_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_core_vc_x64_custom.dll + $(OutDir)wxmsw31u_core.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + $(OutDir)wxmsw310u_core_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index 69dcb4a5fa..e74d784817 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_gl - wxmsw30ud_gl - wxmsw30u_gl - wxmsw30u_gl - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_gl + wxmsw31ud_gl + wxmsw31u_gl + wxmsw31u_gl + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_gllib.pch - $(OutDir)wxmsw30ud_gl.pdb + $(OutDir)wxmsw31ud_gl.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_gl.lib + $(OutDir)wxmsw31ud_gl.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_gllib.pch - $(OutDir)wxmsw30ud_gl.pdb + $(OutDir)wxmsw31ud_gl.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_gl.lib + $(OutDir)wxmsw31ud_gl.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_gllib.pch - $(OutDir)wxmsw30u_gl.pdb + $(OutDir)wxmsw31u_gl.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_gl.lib + $(OutDir)wxmsw31u_gl.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_gllib.pch - $(OutDir)wxmsw30u_gl.pdb + $(OutDir)wxmsw31u_gl.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_gl.lib + $(OutDir)wxmsw31u_gl.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_gldll.pch - $(OutDir)wxmsw30ud_gl_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_gl_vc_custom.dll - $(OutDir)wxmsw30ud_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;wxmsw31ud_core.lib;wxbase31ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_gl_vc_custom.dll + $(OutDir)wxmsw31ud_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_gl_vc_custom.pdb + $(OutDir)wxmsw310ud_gl_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_gldll.pch - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_gl_vc_x64_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=wxmsw30ud_gl_vc_x64_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=wxmsw310ud_gl_vc_x64_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;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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;wxmsw31ud_core.lib;wxbase31ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_gl_vc_x64_custom.dll + $(OutDir)wxmsw31ud_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_gl_vc_x64_custom.pdb $(OutDir)wx_vc9_gl.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_gldll.pch - $(OutDir)wxmsw30u_gl_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_gl_vc_custom.dll - $(OutDir)wxmsw30u_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;wxmsw31u_core.lib;wxbase31u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_gl_vc_custom.dll + $(OutDir)wxmsw31u_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_gl_vc_custom.pdb + $(OutDir)wxmsw310u_gl_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_gldll.pch - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + $(OutDir)wxmsw310u_gl_vc_x64_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=wxmsw30u_gl_vc_x64_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=wxmsw310u_gl_vc_x64_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;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_gl_vc_x64_custom.dll - $(OutDir)wxmsw30u_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;wxmsw31u_core.lib;wxbase31u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_gl_vc_x64_custom.dll + $(OutDir)wxmsw31u_gl.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + $(OutDir)wxmsw310u_gl_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index df99bdbaf6..750a20aedd 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_html - wxmsw30ud_html - wxmsw30u_html - wxmsw30u_html - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_html + wxmsw31ud_html + wxmsw31u_html + wxmsw31u_html + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_htmllib.pch - $(OutDir)wxmsw30ud_html.pdb + $(OutDir)wxmsw31ud_html.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_html.lib + $(OutDir)wxmsw31ud_html.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_htmllib.pch - $(OutDir)wxmsw30ud_html.pdb + $(OutDir)wxmsw31ud_html.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_html.lib + $(OutDir)wxmsw31ud_html.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_htmllib.pch - $(OutDir)wxmsw30u_html.pdb + $(OutDir)wxmsw31u_html.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_html.lib + $(OutDir)wxmsw31u_html.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_htmllib.pch - $(OutDir)wxmsw30u_html.pdb + $(OutDir)wxmsw31u_html.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_html.lib + $(OutDir)wxmsw31u_html.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch - $(OutDir)wxmsw30ud_html_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_html_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_html_vc_custom.dll + $(OutDir)wxmsw31ud_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_html_vc_custom.pdb + $(OutDir)wxmsw310ud_html_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_html_vc_x64_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=wxmsw30ud_html_vc_x64_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=wxmsw310ud_html_vc_x64_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_html_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_html_vc_x64_custom.dll + $(OutDir)wxmsw31ud_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_html_vc_x64_custom.pdb $(OutDir)wx_vc9_html.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_htmldll.pch - $(OutDir)wxmsw30u_html_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_html_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_html_vc_custom.dll + $(OutDir)wxmsw31u_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_html_vc_custom.pdb + $(OutDir)wxmsw310u_html_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_htmldll.pch - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + $(OutDir)wxmsw310u_html_vc_x64_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=wxmsw30u_html_vc_x64_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=wxmsw310u_html_vc_x64_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_html_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_html_vc_x64_custom.dll + $(OutDir)wxmsw31u_html.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + $(OutDir)wxmsw310u_html_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index 7463063ccf..3452d0e042 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_media - wxmsw30ud_media - wxmsw30u_media - wxmsw30u_media - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_media + wxmsw31ud_media + wxmsw31u_media + wxmsw31u_media + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_medialib.pch - $(OutDir)wxmsw30ud_media.pdb + $(OutDir)wxmsw31ud_media.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_media.lib + $(OutDir)wxmsw31ud_media.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_medialib.pch - $(OutDir)wxmsw30ud_media.pdb + $(OutDir)wxmsw31ud_media.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_media.lib + $(OutDir)wxmsw31ud_media.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_medialib.pch - $(OutDir)wxmsw30u_media.pdb + $(OutDir)wxmsw31u_media.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_media.lib + $(OutDir)wxmsw31u_media.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_medialib.pch - $(OutDir)wxmsw30u_media.pdb + $(OutDir)wxmsw31u_media.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_media.lib + $(OutDir)wxmsw31u_media.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch - $(OutDir)wxmsw30ud_media_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_media_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_media_vc_custom.dll + $(OutDir)wxmsw31ud_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_media_vc_custom.pdb + $(OutDir)wxmsw310ud_media_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_media_vc_x64_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=wxmsw30ud_media_vc_x64_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=wxmsw310ud_media_vc_x64_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_media_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_media_vc_x64_custom.dll + $(OutDir)wxmsw31ud_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_media_vc_x64_custom.pdb $(OutDir)wx_vc9_media.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_mediadll.pch - $(OutDir)wxmsw30u_media_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_media_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_media_vc_custom.dll + $(OutDir)wxmsw31u_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_media_vc_custom.pdb + $(OutDir)wxmsw310u_media_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_mediadll.pch - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + $(OutDir)wxmsw310u_media_vc_x64_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=wxmsw30u_media_vc_x64_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=wxmsw310u_media_vc_x64_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_media_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_media_vc_x64_custom.dll + $(OutDir)wxmsw31u_media.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + $(OutDir)wxmsw310u_media_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index 5d5162f218..134e4d184e 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -133,14 +133,14 @@ false true true - wxbase30ud_net - wxbase30ud_net - wxbase30u_net - wxbase30u_net - wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom - wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom + wxbase31ud_net + wxbase31ud_net + wxbase31u_net + wxbase31u_net + wxbase310ud_$(ProjectName)_vc_custom + wxbase310ud_$(ProjectName)_vc_x64_custom + wxbase310u_$(ProjectName)_vc_custom + wxbase310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_netlib.pch - $(OutDir)wxbase30ud_net.pdb + $(OutDir)wxbase31ud_net.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud_net.lib + $(OutDir)wxbase31ud_net.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_netlib.pch - $(OutDir)wxbase30ud_net.pdb + $(OutDir)wxbase31ud_net.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud_net.lib + $(OutDir)wxbase31ud_net.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_netlib.pch - $(OutDir)wxbase30u_net.pdb + $(OutDir)wxbase31u_net.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u_net.lib + $(OutDir)wxbase31u_net.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_netlib.pch - $(OutDir)wxbase30u_net.pdb + $(OutDir)wxbase31u_net.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u_net.lib + $(OutDir)wxbase31u_net.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_netdll.pch - $(OutDir)wxbase30ud_net_vc_custom.pdb + $(OutDir)wxbase310ud_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=wxbase30ud_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=wxbase310ud_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_net_vc_custom.dll - $(OutDir)wxbase30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase310ud_net_vc_custom.dll + $(OutDir)wxbase31ud_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_net_vc_custom.pdb + $(OutDir)wxbase310ud_net_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_netdll.pch - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + $(OutDir)wxbase310ud_net_vc_x64_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=wxbase30ud_net_vc_x64_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=wxbase310ud_net_vc_x64_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_net_vc_x64_custom.dll - $(OutDir)wxbase30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase310ud_net_vc_x64_custom.dll + $(OutDir)wxbase31ud_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + $(OutDir)wxbase310ud_net_vc_x64_custom.pdb $(OutDir)wx_vc9_net.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_netdll.pch - $(OutDir)wxbase30u_net_vc_custom.pdb + $(OutDir)wxbase310u_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=wxbase30u_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=wxbase310u_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_net_vc_custom.dll - $(OutDir)wxbase30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxbase310u_net_vc_custom.dll + $(OutDir)wxbase31u_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_net_vc_custom.pdb + $(OutDir)wxbase310u_net_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_netdll.pch - $(OutDir)wxbase30u_net_vc_x64_custom.pdb + $(OutDir)wxbase310u_net_vc_x64_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=wxbase30u_net_vc_x64_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=wxbase310u_net_vc_x64_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_net_vc_x64_custom.dll - $(OutDir)wxbase30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxbase310u_net_vc_x64_custom.dll + $(OutDir)wxbase31u_net.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_net_vc_x64_custom.pdb + $(OutDir)wxbase310u_net_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index 83a4c1fd54..0e167674f3 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_propgrid - wxmsw30ud_propgrid - wxmsw30u_propgrid - wxmsw30u_propgrid - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_propgrid + wxmsw31ud_propgrid + wxmsw31u_propgrid + wxmsw31u_propgrid + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_propgridlib.pch - $(OutDir)wxmsw30ud_propgrid.pdb + $(OutDir)wxmsw31ud_propgrid.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_propgrid.lib + $(OutDir)wxmsw31ud_propgrid.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_propgridlib.pch - $(OutDir)wxmsw30ud_propgrid.pdb + $(OutDir)wxmsw31ud_propgrid.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_propgrid.lib + $(OutDir)wxmsw31ud_propgrid.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_propgridlib.pch - $(OutDir)wxmsw30u_propgrid.pdb + $(OutDir)wxmsw31u_propgrid.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_propgrid.lib + $(OutDir)wxmsw31u_propgrid.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_propgridlib.pch - $(OutDir)wxmsw30u_propgrid.pdb + $(OutDir)wxmsw31u_propgrid.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_propgrid.lib + $(OutDir)wxmsw31u_propgrid.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch - $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_propgrid_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_propgrid_vc_custom.dll + $(OutDir)wxmsw31ud_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb + $(OutDir)wxmsw310ud_propgrid_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_propgrid_vc_x64_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=wxmsw30ud_propgrid_vc_x64_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=wxmsw310ud_propgrid_vc_x64_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw31ud_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_propgrid_vc_x64_custom.pdb $(OutDir)wx_vc9_propgrid.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch - $(OutDir)wxmsw30u_propgrid_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_propgrid_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_propgrid_vc_custom.dll + $(OutDir)wxmsw31u_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_propgrid_vc_custom.pdb + $(OutDir)wxmsw310u_propgrid_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + $(OutDir)wxmsw310u_propgrid_vc_x64_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=wxmsw30u_propgrid_vc_x64_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=wxmsw310u_propgrid_vc_x64_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw31u_propgrid.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + $(OutDir)wxmsw310u_propgrid_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index dbe1f7daa6..98ec58cb68 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_qa - wxmsw30ud_qa - wxmsw30u_qa - wxmsw30u_qa - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_qa + wxmsw31ud_qa + wxmsw31u_qa + wxmsw31u_qa + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_qalib.pch - $(OutDir)wxmsw30ud_qa.pdb + $(OutDir)wxmsw31ud_qa.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_qa.lib + $(OutDir)wxmsw31ud_qa.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_qalib.pch - $(OutDir)wxmsw30ud_qa.pdb + $(OutDir)wxmsw31ud_qa.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_qa.lib + $(OutDir)wxmsw31ud_qa.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_qalib.pch - $(OutDir)wxmsw30u_qa.pdb + $(OutDir)wxmsw31u_qa.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_qa.lib + $(OutDir)wxmsw31u_qa.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_qalib.pch - $(OutDir)wxmsw30u_qa.pdb + $(OutDir)wxmsw31u_qa.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_qa.lib + $(OutDir)wxmsw31u_qa.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_qadll.pch - $(OutDir)wxmsw30ud_qa_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_qa_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;$(OutDir)wxbase31ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_qa_vc_custom.dll + $(OutDir)wxmsw31ud_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_qa_vc_custom.pdb + $(OutDir)wxmsw310ud_qa_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_qadll.pch - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_qa_vc_x64_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=wxmsw30ud_qa_vc_x64_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=wxmsw310ud_qa_vc_x64_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;$(OutDir)wxbase31ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_qa_vc_x64_custom.dll + $(OutDir)wxmsw31ud_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_qa_vc_x64_custom.pdb $(OutDir)wx_vc9_qa.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_qadll.pch - $(OutDir)wxmsw30u_qa_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_qa_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;$(OutDir)wxbase31u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_qa_vc_custom.dll + $(OutDir)wxmsw31u_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_qa_vc_custom.pdb + $(OutDir)wxmsw310u_qa_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_qadll.pch - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + $(OutDir)wxmsw310u_qa_vc_x64_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=wxmsw30u_qa_vc_x64_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=wxmsw310u_qa_vc_x64_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_qa_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;$(OutDir)wxbase31u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_qa_vc_x64_custom.dll + $(OutDir)wxmsw31u_qa.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + $(OutDir)wxmsw310u_qa_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 9e3b339e3b..c45054e578 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_ribbon - wxmsw30ud_ribbon - wxmsw30u_ribbon - wxmsw30u_ribbon - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_ribbon + wxmsw31ud_ribbon + wxmsw31u_ribbon + wxmsw31u_ribbon + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch - $(OutDir)wxmsw30ud_ribbon.pdb + $(OutDir)wxmsw31ud_ribbon.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_ribbon.lib + $(OutDir)wxmsw31ud_ribbon.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch - $(OutDir)wxmsw30ud_ribbon.pdb + $(OutDir)wxmsw31ud_ribbon.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_ribbon.lib + $(OutDir)wxmsw31ud_ribbon.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch - $(OutDir)wxmsw30u_ribbon.pdb + $(OutDir)wxmsw31u_ribbon.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_ribbon.lib + $(OutDir)wxmsw31u_ribbon.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch - $(OutDir)wxmsw30u_ribbon.pdb + $(OutDir)wxmsw31u_ribbon.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_ribbon.lib + $(OutDir)wxmsw31u_ribbon.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch - $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_ribbon_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_ribbon_vc_custom.dll + $(OutDir)wxmsw31ud_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb + $(OutDir)wxmsw310ud_ribbon_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_ribbon_vc_x64_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=wxmsw30ud_ribbon_vc_x64_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=wxmsw310ud_ribbon_vc_x64_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw31ud_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_ribbon_vc_x64_custom.pdb $(OutDir)wx_vc9_ribbon.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch - $(OutDir)wxmsw30u_ribbon_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_ribbon_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_ribbon_vc_custom.dll + $(OutDir)wxmsw31u_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_ribbon_vc_custom.pdb + $(OutDir)wxmsw310u_ribbon_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + $(OutDir)wxmsw310u_ribbon_vc_x64_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=wxmsw30u_ribbon_vc_x64_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=wxmsw310u_ribbon_vc_x64_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw31u_ribbon.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + $(OutDir)wxmsw310u_ribbon_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index 3df210aa38..96c8c6e26f 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_richtext - wxmsw30ud_richtext - wxmsw30u_richtext - wxmsw30u_richtext - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_richtext + wxmsw31ud_richtext + wxmsw31u_richtext + wxmsw31u_richtext + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_richtextlib.pch - $(OutDir)wxmsw30ud_richtext.pdb + $(OutDir)wxmsw31ud_richtext.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_richtext.lib + $(OutDir)wxmsw31ud_richtext.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_richtextlib.pch - $(OutDir)wxmsw30ud_richtext.pdb + $(OutDir)wxmsw31ud_richtext.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_richtext.lib + $(OutDir)wxmsw31ud_richtext.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_richtextlib.pch - $(OutDir)wxmsw30u_richtext.pdb + $(OutDir)wxmsw31u_richtext.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_richtext.lib + $(OutDir)wxmsw31u_richtext.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_richtextlib.pch - $(OutDir)wxmsw30u_richtext.pdb + $(OutDir)wxmsw31u_richtext.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_richtext.lib + $(OutDir)wxmsw31u_richtext.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch - $(OutDir)wxmsw30ud_richtext_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)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 + 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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_html.lib;$(OutDir)wxbase31ud_xml.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_richtext_vc_custom.dll + $(OutDir)wxmsw31ud_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_richtext_vc_custom.pdb + $(OutDir)wxmsw310ud_richtext_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_richtext_vc_x64_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=wxmsw30ud_richtext_vc_x64_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=wxmsw310ud_richtext_vc_x64_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)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_html.lib;$(OutDir)wxbase31ud_xml.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_richtext_vc_x64_custom.dll + $(OutDir)wxmsw31ud_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_richtext_vc_x64_custom.pdb $(OutDir)wx_vc9_richtext.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch - $(OutDir)wxmsw30u_richtext_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)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 + 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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_html.lib;$(OutDir)wxbase31u_xml.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_richtext_vc_custom.dll + $(OutDir)wxmsw31u_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_richtext_vc_custom.pdb + $(OutDir)wxmsw310u_richtext_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + $(OutDir)wxmsw310u_richtext_vc_x64_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=wxmsw30u_richtext_vc_x64_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=wxmsw310u_richtext_vc_x64_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)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_html.lib;$(OutDir)wxbase31u_xml.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_richtext_vc_x64_custom.dll + $(OutDir)wxmsw31u_richtext.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + $(OutDir)wxmsw310u_richtext_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index c80da2e4f9..479558c4a0 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_stc - wxmsw30ud_stc - wxmsw30u_stc - wxmsw30u_stc - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_stc + wxmsw31ud_stc + wxmsw31u_stc + wxmsw31u_stc + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_stclib.pch - $(OutDir)wxmsw30ud_stc.pdb + $(OutDir)wxmsw31ud_stc.pdb Level4 true ProgramDatabase @@ -171,7 +171,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)wxmsw30ud_stc.lib + $(OutDir)wxmsw31ud_stc.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_stclib.pch - $(OutDir)wxmsw30ud_stc.pdb + $(OutDir)wxmsw31ud_stc.pdb Level4 true ProgramDatabase @@ -208,7 +208,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)wxmsw30ud_stc.lib + $(OutDir)wxmsw31ud_stc.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_stclib.pch - $(OutDir)wxmsw30u_stc.pdb + $(OutDir)wxmsw31u_stc.pdb Level4 true ProgramDatabase @@ -243,7 +243,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)wxmsw30u_stc.lib + $(OutDir)wxmsw31u_stc.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_stclib.pch - $(OutDir)wxmsw30u_stc.pdb + $(OutDir)wxmsw31u_stc.pdb Level4 true ProgramDatabase @@ -278,7 +278,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)wxmsw30u_stc.lib + $(OutDir)wxmsw31u_stc.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch - $(OutDir)wxmsw30ud_stc_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_stc_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_stc_vc_custom.dll + $(OutDir)wxmsw31ud_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_stc_vc_custom.pdb + $(OutDir)wxmsw310ud_stc_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_stc_vc_x64_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=wxmsw30ud_stc_vc_x64_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=wxmsw310ud_stc_vc_x64_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_stc_vc_x64_custom.dll + $(OutDir)wxmsw31ud_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_stc_vc_x64_custom.pdb $(OutDir)wx_vc9_stc.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_stcdll.pch - $(OutDir)wxmsw30u_stc_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_stc_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_stc_vc_custom.dll + $(OutDir)wxmsw31u_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_stc_vc_custom.pdb + $(OutDir)wxmsw310u_stc_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_stcdll.pch - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + $(OutDir)wxmsw310u_stc_vc_x64_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=wxmsw30u_stc_vc_x64_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=wxmsw310u_stc_vc_x64_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_stc_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_stc_vc_x64_custom.dll + $(OutDir)wxmsw31u_stc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + $(OutDir)wxmsw310u_stc_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index 86e6c358b8..7f13b9cc1d 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_webview - wxmsw30ud_webview - wxmsw30u_webview - wxmsw30u_webview - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_webview + wxmsw31ud_webview + wxmsw31u_webview + wxmsw31u_webview + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_webviewlib.pch - $(OutDir)wxmsw30ud_webview.pdb + $(OutDir)wxmsw31ud_webview.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_webview.lib + $(OutDir)wxmsw31ud_webview.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_webviewlib.pch - $(OutDir)wxmsw30ud_webview.pdb + $(OutDir)wxmsw31ud_webview.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_webview.lib + $(OutDir)wxmsw31ud_webview.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_webviewlib.pch - $(OutDir)wxmsw30u_webview.pdb + $(OutDir)wxmsw31u_webview.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_webview.lib + $(OutDir)wxmsw31u_webview.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_webviewlib.pch - $(OutDir)wxmsw30u_webview.pdb + $(OutDir)wxmsw31u_webview.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_webview.lib + $(OutDir)wxmsw31u_webview.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch - $(OutDir)wxmsw30ud_webview_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_webview_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_webview_vc_custom.dll + $(OutDir)wxmsw31ud_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_webview_vc_custom.pdb + $(OutDir)wxmsw310ud_webview_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch - $(OutDir)wxmsw30ud_webview_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_webview_vc_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_core.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_webview_vc_custom.dll + $(OutDir)wxmsw31ud_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_webview_vc_custom.pdb + $(OutDir)wxmsw310ud_webview_vc_custom.pdb $(OutDir)wx_vc9_webview.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch - $(OutDir)wxmsw30u_webview_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_webview_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_webview_vc_custom.dll + $(OutDir)wxmsw31u_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_webview_vc_custom.pdb + $(OutDir)wxmsw310u_webview_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch - $(OutDir)wxmsw30u_webview_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_webview_vc_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_core.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_webview_vc_custom.dll + $(OutDir)wxmsw31u_webview.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_webview_vc_custom.pdb + $(OutDir)wxmsw310u_webview_vc_custom.pdb true true diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index c65f94c301..a09f4300c9 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -133,14 +133,14 @@ false true true - wxbase30ud_xml - wxbase30ud_xml - wxbase30u_xml - wxbase30u_xml - wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom - wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom + wxbase31ud_xml + wxbase31ud_xml + wxbase31u_xml + wxbase31u_xml + wxbase310ud_$(ProjectName)_vc_custom + wxbase310ud_$(ProjectName)_vc_x64_custom + wxbase310u_$(ProjectName)_vc_custom + wxbase310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_xmllib.pch - $(OutDir)wxbase30ud_xml.pdb + $(OutDir)wxbase31ud_xml.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud_xml.lib + $(OutDir)wxbase31ud_xml.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_xmllib.pch - $(OutDir)wxbase30ud_xml.pdb + $(OutDir)wxbase31ud_xml.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30ud_xml.lib + $(OutDir)wxbase31ud_xml.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_xmllib.pch - $(OutDir)wxbase30u_xml.pdb + $(OutDir)wxbase31u_xml.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u_xml.lib + $(OutDir)wxbase31u_xml.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_xmllib.pch - $(OutDir)wxbase30u_xml.pdb + $(OutDir)wxbase31u_xml.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxbase30u_xml.lib + $(OutDir)wxbase31u_xml.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch - $(OutDir)wxbase30ud_xml_vc_custom.pdb + $(OutDir)wxbase310ud_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=wxbase30ud_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=wxbase310ud_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_xml_vc_custom.dll - $(OutDir)wxbase30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase310ud_xml_vc_custom.dll + $(OutDir)wxbase31ud_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_xml_vc_custom.pdb + $(OutDir)wxbase310ud_xml_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + $(OutDir)wxbase310ud_xml_vc_x64_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=wxbase30ud_xml_vc_x64_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=wxbase310ud_xml_vc_x64_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)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_xml_vc_x64_custom.dll - $(OutDir)wxbase30ud_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)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase310ud_xml_vc_x64_custom.dll + $(OutDir)wxbase31ud_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + $(OutDir)wxbase310ud_xml_vc_x64_custom.pdb $(OutDir)wx_vc9_xml.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_xmldll.pch - $(OutDir)wxbase30u_xml_vc_custom.pdb + $(OutDir)wxbase310u_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=wxbase30u_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=wxbase310u_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_xml_vc_custom.dll - $(OutDir)wxbase30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxbase310u_xml_vc_custom.dll + $(OutDir)wxbase31u_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_xml_vc_custom.pdb + $(OutDir)wxbase310u_xml_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_xmldll.pch - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + $(OutDir)wxbase310u_xml_vc_x64_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=wxbase30u_xml_vc_x64_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=wxbase310u_xml_vc_x64_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)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_xml_vc_x64_custom.dll - $(OutDir)wxbase30u_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)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxbase310u_xml_vc_x64_custom.dll + $(OutDir)wxbase31u_xml.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + $(OutDir)wxbase310u_xml_vc_x64_custom.pdb true true diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index f84d3bdb55..a113911c6d 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -133,14 +133,14 @@ false true true - wxmsw30ud_xrc - wxmsw30ud_xrc - wxmsw30u_xrc - wxmsw30u_xrc - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom + wxmsw31ud_xrc + wxmsw31ud_xrc + wxmsw31u_xrc + wxmsw31u_xrc + wxmsw310ud_$(ProjectName)_vc_custom + wxmsw310ud_$(ProjectName)_vc_x64_custom + wxmsw310u_$(ProjectName)_vc_custom + wxmsw310u_$(ProjectName)_vc_x64_custom @@ -160,7 +160,7 @@ Use wx/wxprec.h vc_mswud\wxprec_xrclib.pch - $(OutDir)wxmsw30ud_xrc.pdb + $(OutDir)wxmsw31ud_xrc.pdb Level4 true ProgramDatabase @@ -171,7 +171,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_xrc.lib + $(OutDir)wxmsw31ud_xrc.lib true @@ -197,7 +197,7 @@ Use wx/wxprec.h vc_mswud\wxprec_xrclib.pch - $(OutDir)wxmsw30ud_xrc.pdb + $(OutDir)wxmsw31ud_xrc.pdb Level4 true ProgramDatabase @@ -208,7 +208,7 @@ $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30ud_xrc.lib + $(OutDir)wxmsw31ud_xrc.lib true @@ -232,7 +232,7 @@ Use wx/wxprec.h vc_mswu\wxprec_xrclib.pch - $(OutDir)wxmsw30u_xrc.pdb + $(OutDir)wxmsw31u_xrc.pdb Level4 true ProgramDatabase @@ -243,7 +243,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_xrc.lib + $(OutDir)wxmsw31u_xrc.lib true @@ -267,7 +267,7 @@ Use wx/wxprec.h vc_mswu\wxprec_xrclib.pch - $(OutDir)wxmsw30u_xrc.pdb + $(OutDir)wxmsw31u_xrc.pdb Level4 true ProgramDatabase @@ -278,7 +278,7 @@ $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - $(OutDir)wxmsw30u_xrc.lib + $(OutDir)wxmsw31u_xrc.lib true @@ -304,25 +304,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch - $(OutDir)wxmsw30ud_xrc_vc_custom.pdb + $(OutDir)wxmsw310ud_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=wxmsw30ud_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=wxmsw310ud_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)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 + 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)wxmsw31ud_html.lib;$(OutDir)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud_xml.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_xrc_vc_custom.dll + $(OutDir)wxmsw31ud_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_xrc_vc_custom.pdb + $(OutDir)wxmsw310ud_xrc_vc_custom.pdb MachineX86 @@ -348,25 +348,25 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_xrc_vc_x64_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=wxmsw30ud_xrc_vc_x64_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=wxmsw310ud_xrc_vc_x64_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)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_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)wxmsw31ud_html.lib;$(OutDir)wxmsw31ud_adv.lib;$(OutDir)wxmsw31ud_core.lib;$(OutDir)wxbase31ud_xml.lib;$(OutDir)wxbase31ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310ud_xrc_vc_x64_custom.dll + $(OutDir)wxmsw31ud_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + $(OutDir)wxmsw310ud_xrc_vc_x64_custom.pdb $(OutDir)wx_vc9_xrc.bsc @@ -389,25 +389,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch - $(OutDir)wxmsw30u_xrc_vc_custom.pdb + $(OutDir)wxmsw310u_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=wxmsw30u_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=wxmsw310u_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)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 + 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)wxmsw31u_html.lib;$(OutDir)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u_xml.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_xrc_vc_custom.dll + $(OutDir)wxmsw31u_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_xrc_vc_custom.pdb + $(OutDir)wxmsw310u_xrc_vc_custom.pdb MachineX86 true true @@ -433,25 +433,25 @@ Use wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + $(OutDir)wxmsw310u_xrc_vc_x64_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=wxmsw30u_xrc_vc_x64_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=wxmsw310u_xrc_vc_x64_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)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30u_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)wxmsw31u_html.lib;$(OutDir)wxmsw31u_adv.lib;$(OutDir)wxmsw31u_core.lib;$(OutDir)wxbase31u_xml.lib;$(OutDir)wxbase31u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw310u_xrc_vc_x64_custom.dll + $(OutDir)wxmsw31u_xrc.lib true $(OutDir);%(AdditionalLibraryDirectories) true - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + $(OutDir)wxmsw310u_xrc_vc_x64_custom.pdb true true