From e4c7db4552fb8d2e8d6e36afb05a957ea7f470f7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 26 Jul 2013 15:27:51 +0000 Subject: [PATCH] Remove wxUniversal configuration from the MSVC 10 project files. As these configurations are not present in the automatically generated files any more, remove them from the manually created ones too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/msw/wx_vc10.sln | 188 ---- build/msw/wx_vc10_adv.vcxproj | 320 +----- build/msw/wx_vc10_adv.vcxproj.filters | 5 +- build/msw/wx_vc10_aui.vcxproj | 264 +---- build/msw/wx_vc10_aui.vcxproj.filters | 5 +- build/msw/wx_vc10_base.vcxproj | 272 +---- build/msw/wx_vc10_base.vcxproj.filters | 5 +- build/msw/wx_vc10_core.vcxproj | 955 +----------------- build/msw/wx_vc10_core.vcxproj.filters | 258 ----- build/msw/wx_vc10_gl.vcxproj | 264 +---- build/msw/wx_vc10_gl.vcxproj.filters | 5 +- build/msw/wx_vc10_html.vcxproj | 264 +---- build/msw/wx_vc10_html.vcxproj.filters | 5 +- build/msw/wx_vc10_media.vcxproj | 264 +---- build/msw/wx_vc10_media.vcxproj.filters | 5 +- build/msw/wx_vc10_net.vcxproj | 264 +---- build/msw/wx_vc10_net.vcxproj.filters | 5 +- build/msw/wx_vc10_propgrid.vcxproj | 264 +---- build/msw/wx_vc10_propgrid.vcxproj.filters | 5 +- build/msw/wx_vc10_qa.vcxproj | 264 +---- build/msw/wx_vc10_qa.vcxproj.filters | 5 +- build/msw/wx_vc10_ribbon.vcxproj | 264 +---- build/msw/wx_vc10_ribbon.vcxproj.filters | 5 +- build/msw/wx_vc10_richtext.vcxproj | 264 +---- build/msw/wx_vc10_richtext.vcxproj.filters | 5 +- build/msw/wx_vc10_stc.vcxproj | 264 +---- build/msw/wx_vc10_stc.vcxproj.filters | 5 +- build/msw/wx_vc10_webview.vcxproj | 264 +---- build/msw/wx_vc10_webview.vcxproj.filters | 5 +- build/msw/wx_vc10_wxexpat.vcxproj | 190 ---- build/msw/wx_vc10_wxjpeg.vcxproj | 190 ---- build/msw/wx_vc10_wxpng.vcxproj | 190 ---- build/msw/wx_vc10_wxregex.vcxproj | 228 +---- build/msw/wx_vc10_wxregex.vcxproj.filters | 5 +- build/msw/wx_vc10_wxscintilla.vcxproj | 226 +---- build/msw/wx_vc10_wxscintilla.vcxproj.filters | 5 +- build/msw/wx_vc10_wxtiff.vcxproj | 190 ---- build/msw/wx_vc10_wxzlib.vcxproj | 190 ---- build/msw/wx_vc10_xml.vcxproj | 264 +---- build/msw/wx_vc10_xml.vcxproj.filters | 5 +- build/msw/wx_vc10_xrc.vcxproj | 264 +---- build/msw/wx_vc10_xrc.vcxproj.filters | 5 +- 42 files changed, 68 insertions(+), 6846 deletions(-) diff --git a/build/msw/wx_vc10.sln b/build/msw/wx_vc10.sln index 10296de82a..77e59126b5 100644 --- a/build/msw/wx_vc10.sln +++ b/build/msw/wx_vc10.sln @@ -111,11 +111,7 @@ Global Debug|Win32 = Debug|Win32 DLL Debug|Win32 = DLL Debug|Win32 DLL Release|Win32 = DLL Release|Win32 - DLL Universal Debug|Win32 = DLL Universal Debug|Win32 - DLL Universal Release|Win32 = DLL Universal Release|Win32 Release|Win32 = Release|Win32 - Universal Debug|Win32 = Universal Debug|Win32 - Universal Release|Win32 = Universal Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -124,368 +120,184 @@ Global {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Universal Release|Win32.Build.0 = Universal Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Universal Release|Win32.Build.0 = Universal Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Universal Release|Win32.Build.0 = Universal Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Universal Release|Win32.Build.0 = Universal Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Universal Release|Win32.Build.0 = Universal Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Universal Release|Win32.Build.0 = Universal Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Universal Release|Win32.Build.0 = Universal Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Universal Release|Win32.Build.0 = Universal Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Universal Release|Win32.Build.0 = Universal Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Universal Release|Win32.Build.0 = Universal Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Universal Release|Win32.Build.0 = Universal Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Universal Release|Win32.Build.0 = Universal Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Universal Release|Win32.Build.0 = Universal Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Universal Release|Win32.Build.0 = Universal Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Universal Release|Win32.Build.0 = Universal Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Universal Release|Win32.Build.0 = Universal Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Universal Release|Win32.Build.0 = Universal Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Universal Release|Win32.Build.0 = Universal Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Universal Release|Win32.Build.0 = Universal Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Universal Release|Win32.Build.0 = Universal Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Universal Release|Win32.Build.0 = Universal Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Universal Release|Win32.Build.0 = Universal Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Debug|Win32.Build.0 = Universal Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.ActiveCfg = Universal Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Universal Release|Win32.Build.0 = Universal Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index fd330c1c0e..754ef5dda6 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - adv {24C45343-FD20-5C92-81C1-35A2AE841E79} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\adv\ ..\..\lib\vc_lib\ vc_mswu\adv\ - ..\..\lib\vc_lib\ - vc_mswunivud\adv\ - ..\..\lib\vc_lib\ - vc_mswunivu\adv\ ..\..\lib\vc_dll\ vc_mswuddll\adv\ true @@ -125,18 +73,8 @@ vc_mswudll\adv\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\adv\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\adv\ - false - true wxmsw29ud_adv $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_advlib.pch - vc_mswunivud\adv\ - ..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_adv.lib - true - - - ..\..\lib\vc_lib\wx_vc9_adv.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_advlib.pch - vc_mswunivu\adv\ - ..\..\lib\vc_lib\wxmswuniv29u_adv.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_adv.lib - true - - - ..\..\lib\vc_lib\wx_vc9_adv.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) @@ -376,96 +240,6 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_advdll.pch - vc_mswunivuddll\adv\ - ..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_adv.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_advdll.pch - vc_mswunivudll\adv\ - ..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_adv.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_adv.bsc - true - - @@ -474,12 +248,8 @@ Create Create - Create - Create Create Create - Create - Create @@ -487,59 +257,19 @@ - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - + + + + + + + - - true - true - true - true - + @@ -571,8 +301,6 @@ true true - true - true @@ -590,20 +318,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - @@ -618,14 +332,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -634,14 +340,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -703,4 +401,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_adv.vcxproj.filters b/build/msw/wx_vc10_adv.vcxproj.filters index ad84cc13d4..c683aa4e44 100644 --- a/build/msw/wx_vc10_adv.vcxproj.filters +++ b/build/msw/wx_vc10_adv.vcxproj.filters @@ -369,11 +369,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 4c7d45cd30..58ce40ed60 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - aui {A16D3832-0F42-57CE-8F48-50E06649ADE8} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\aui\ ..\..\lib\vc_lib\ vc_mswu\aui\ - ..\..\lib\vc_lib\ - vc_mswunivud\aui\ - ..\..\lib\vc_lib\ - vc_mswunivu\aui\ ..\..\lib\vc_dll\ vc_mswuddll\aui\ true @@ -125,18 +73,8 @@ vc_mswudll\aui\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\aui\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\aui\ - false - true wxmsw29ud_aui $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_auilib.pch - vc_mswunivud\aui\ - ..\..\lib\vc_lib\wxmswuniv29ud_aui.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_aui.lib - true - - - ..\..\lib\vc_lib\wx_vc9_aui.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_auilib.pch - vc_mswunivu\aui\ - ..\..\lib\vc_lib\wxmswuniv29u_aui.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_aui.lib - true - - - ..\..\lib\vc_lib\wx_vc9_aui.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_auidll.pch - vc_mswunivuddll\aui\ - ..\..\lib\vc_dll\wxmswuniv295ud_aui_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_adv.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_aui_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_aui.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_aui_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_aui.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_auidll.pch - vc_mswunivudll\aui\ - ..\..\lib\vc_dll\wxmswuniv295u_aui_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_adv.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_aui_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_aui.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_aui_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_aui.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -489,8 +259,6 @@ true true - true - true @@ -508,20 +276,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -531,14 +285,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -547,14 +293,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -568,4 +306,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_aui.vcxproj.filters b/build/msw/wx_vc10_aui.vcxproj.filters index 20d338d600..055d0682f6 100644 --- a/build/msw/wx_vc10_aui.vcxproj.filters +++ b/build/msw/wx_vc10_aui.vcxproj.filters @@ -82,11 +82,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index a07a8ed419..4fff5b2241 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - base {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\base\ ..\..\lib\vc_lib\ vc_mswu\base\ - ..\..\lib\vc_lib\ - vc_mswunivud\base\ - ..\..\lib\vc_lib\ - vc_mswunivu\base\ ..\..\lib\vc_dll\ vc_mswuddll\base\ true @@ -125,18 +73,8 @@ vc_mswudll\base\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\base\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\base\ - false - true wxbase29ud $(ProjectName)d - $(ProjectName)d - $(ProjectName)d wxbase29u @@ -213,80 +151,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_baselib.pch - vc_mswunivud\base\ - ..\..\lib\vc_lib\wxbase29ud.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29ud.lib - true - - - ..\..\lib\vc_lib\wx_vc9_base.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_baselib.pch - vc_mswunivu\base\ - ..\..\lib\vc_lib\wxbase29u.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29u.lib - true - - - ..\..\lib\vc_lib\wx_vc9_base.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -377,96 +241,6 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_basedll.pch - vc_mswunivuddll\base\ - ..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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) - ..\..\lib\vc_dll\wxbase295ud_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_base.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_basedll.pch - vc_mswunivudll\base\ - ..\..\lib\vc_dll\wxbase295u_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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) - ..\..\lib\vc_dll\wxbase295u_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295u_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_base.bsc - true - - @@ -486,12 +260,8 @@ Create Create - Create - Create Create Create - Create - Create @@ -504,18 +274,10 @@ - - - - - - - - @@ -612,8 +374,6 @@ true true - true - true @@ -631,20 +391,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - @@ -663,14 +409,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -679,14 +417,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -864,4 +594,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_base.vcxproj.filters b/build/msw/wx_vc10_base.vcxproj.filters index ce93b4e1a6..a0ab314a64 100644 --- a/build/msw/wx_vc10_base.vcxproj.filters +++ b/build/msw/wx_vc10_base.vcxproj.filters @@ -921,11 +921,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 322144ded9..604affb46f 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - core {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\core\ ..\..\lib\vc_lib\ vc_mswu\core\ - ..\..\lib\vc_lib\ - vc_mswunivud\core\ - ..\..\lib\vc_lib\ - vc_mswunivu\core\ ..\..\lib\vc_dll\ vc_mswuddll\core\ true @@ -125,18 +73,8 @@ vc_mswudll\core\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\core\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\core\ - false - true wxmsw29ud_core $(ProjectName)d - $(ProjectName)d - $(ProjectName)d wxmsw29u_core @@ -213,80 +151,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_corelib.pch - vc_mswunivud\core\ - ..\..\lib\vc_lib\wxmswuniv29ud_core.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_core.lib - true - - - ..\..\lib\vc_lib\wx_vc9_core.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_corelib.pch - vc_mswunivu\core\ - ..\..\lib\vc_lib\wxmswuniv29u_core.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_core.lib - true - - - ..\..\lib\vc_lib\wx_vc9_core.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) @@ -377,96 +241,6 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_coredll.pch - vc_mswunivuddll\core\ - ..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_core.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_core_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_core.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_coredll.pch - vc_mswunivudll\core\ - ..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_core.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_core_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_core.bsc - true - - @@ -510,12 +284,8 @@ Create Create - Create - Create Create Create - Create - Create @@ -613,120 +383,63 @@ vc_mswuddll\core\msw_accel.obj vc_mswudll\core\msw_accel.obj - true - true vc_mswud\core\msw_accel.obj vc_mswu\core\msw_accel.obj - true - true - - - true - true - true - true + - - true - true - true - true - + - - true - true - true - true - + vc_mswuddll\core\msw_bmpbuttn.obj vc_mswudll\core\msw_bmpbuttn.obj - true - true vc_mswud\core\msw_bmpbuttn.obj vc_mswu\core\msw_bmpbuttn.obj - true - true vc_mswuddll\core\msw_button.obj vc_mswudll\core\msw_button.obj - true - true vc_mswud\core\msw_button.obj vc_mswu\core\msw_button.obj - true - true vc_mswuddll\core\msw_checkbox.obj vc_mswudll\core\msw_checkbox.obj - true - true vc_mswud\core\msw_checkbox.obj vc_mswu\core\msw_checkbox.obj - true - true vc_mswuddll\core\msw_checklst.obj vc_mswudll\core\msw_checklst.obj - true - true vc_mswud\core\msw_checklst.obj vc_mswu\core\msw_checklst.obj - true - true vc_mswuddll\core\msw_choice.obj vc_mswudll\core\msw_choice.obj - true - true vc_mswud\core\msw_choice.obj vc_mswu\core\msw_choice.obj - true - true - - true - true - true - true - + - - true - true - true - true - + vc_mswuddll\core\msw_combobox.obj vc_mswudll\core\msw_combobox.obj - true - true vc_mswud\core\msw_combobox.obj vc_mswu\core\msw_combobox.obj - true - true vc_mswuddll\core\msw_control.obj vc_mswudll\core\msw_control.obj - true - true vc_mswud\core\msw_control.obj vc_mswu\core\msw_control.obj - true - true @@ -739,28 +452,14 @@ vc_mswuddll\core\msw_dialog.obj vc_mswudll\core\msw_dialog.obj - true - true vc_mswud\core\msw_dialog.obj vc_mswu\core\msw_dialog.obj - true - true - - true - true - true - true - + - - true - true - true - true - + @@ -768,334 +467,163 @@ vc_mswuddll\core\msw_fdrepdlg.obj vc_mswudll\core\msw_fdrepdlg.obj - true - true vc_mswud\core\msw_fdrepdlg.obj vc_mswu\core\msw_fdrepdlg.obj - true - true - - - true - true - true - true + - - true - true - true - true - + - - true - true - true - true - + vc_mswuddll\core\msw_gauge.obj vc_mswudll\core\msw_gauge.obj - true - true vc_mswud\core\msw_gauge.obj vc_mswu\core\msw_gauge.obj - true - true - - true - true - true - true - + - - true - true - true - true - + vc_mswuddll\core\msw_listbox.obj vc_mswudll\core\msw_listbox.obj - true - true vc_mswud\core\msw_listbox.obj vc_mswu\core\msw_listbox.obj - true - true vc_mswuddll\core\msw_listctrl.obj vc_mswudll\core\msw_listctrl.obj - true - true vc_mswud\core\msw_listctrl.obj vc_mswu\core\msw_listctrl.obj - true - true - - true - true - true - true - + vc_mswuddll\core\msw_menu.obj vc_mswudll\core\msw_menu.obj - true - true vc_mswud\core\msw_menu.obj vc_mswu\core\msw_menu.obj - true - true - - - true - true - true - true - - - true - true - true - true + + - - true - true - true - true - + - - true - true - true - true - - - true - true - true - true - + + vc_mswuddll\core\msw_notebook.obj vc_mswudll\core\msw_notebook.obj - true - true vc_mswud\core\msw_notebook.obj vc_mswu\core\msw_notebook.obj - true - true - - true - true - true - true - + - - true - true - true - true - + - - true - true - true - true - + vc_mswuddll\core\msw_radiobox.obj vc_mswudll\core\msw_radiobox.obj - true - true vc_mswud\core\msw_radiobox.obj vc_mswu\core\msw_radiobox.obj - true - true vc_mswuddll\core\msw_radiobut.obj vc_mswudll\core\msw_radiobut.obj - true - true vc_mswud\core\msw_radiobut.obj vc_mswu\core\msw_radiobut.obj - true - true - - true - true - true - true - + vc_mswuddll\core\msw_scrolbar.obj vc_mswudll\core\msw_scrolbar.obj - true - true vc_mswud\core\msw_scrolbar.obj vc_mswu\core\msw_scrolbar.obj - true - true vc_mswuddll\core\msw_slider.obj vc_mswudll\core\msw_slider.obj - true - true vc_mswud\core\msw_slider.obj vc_mswu\core\msw_slider.obj - true - true vc_mswuddll\core\msw_spinbutt.obj vc_mswudll\core\msw_spinbutt.obj - true - true vc_mswud\core\msw_spinbutt.obj vc_mswu\core\msw_spinbutt.obj - true - true - - - true - true - true - true + vc_mswuddll\core\msw_statbmp.obj vc_mswudll\core\msw_statbmp.obj - true - true vc_mswud\core\msw_statbmp.obj vc_mswu\core\msw_statbmp.obj - true - true vc_mswuddll\core\msw_statbox.obj vc_mswudll\core\msw_statbox.obj - true - true vc_mswud\core\msw_statbox.obj vc_mswu\core\msw_statbox.obj - true - true vc_mswuddll\core\msw_statline.obj vc_mswudll\core\msw_statline.obj - true - true vc_mswud\core\msw_statline.obj vc_mswu\core\msw_statline.obj - true - true vc_mswuddll\core\msw_stattext.obj vc_mswudll\core\msw_stattext.obj - true - true vc_mswud\core\msw_stattext.obj vc_mswu\core\msw_stattext.obj - true - true - - - true - true - true - true + vc_mswuddll\core\msw_textctrl.obj vc_mswudll\core\msw_textctrl.obj - true - true vc_mswud\core\msw_textctrl.obj vc_mswu\core\msw_textctrl.obj - true - true - - - true - true - true - true + vc_mswuddll\core\msw_textmeasure.obj vc_mswudll\core\msw_textmeasure.obj - true - true vc_mswud\core\msw_textmeasure.obj vc_mswu\core\msw_textmeasure.obj - true - true vc_mswuddll\core\msw_tglbtn.obj vc_mswudll\core\msw_tglbtn.obj - true - true vc_mswud\core\msw_tglbtn.obj vc_mswu\core\msw_tglbtn.obj - true - true vc_mswuddll\core\msw_toolbar.obj vc_mswudll\core\msw_toolbar.obj - true - true vc_mswud\core\msw_toolbar.obj vc_mswu\core\msw_toolbar.obj - true - true - - true - true - true - true - + @@ -1106,12 +634,8 @@ true true - vc_mswunivuddll\core\generic_accel.obj - vc_mswunivudll\core\generic_accel.obj true true - vc_mswunivud\core\generic_accel.obj - vc_mswunivu\core\generic_accel.obj @@ -1138,12 +662,8 @@ true true - vc_mswunivuddll\core\generic_fdrepdlg.obj - vc_mswunivudll\core\generic_fdrepdlg.obj true true - vc_mswunivud\core\generic_fdrepdlg.obj - vc_mswunivu\core\generic_fdrepdlg.obj @@ -1167,12 +687,8 @@ true true - vc_mswunivuddll\core\generic_listctrl.obj - vc_mswunivudll\core\generic_listctrl.obj true true - vc_mswunivud\core\generic_listctrl.obj - vc_mswunivu\core\generic_listctrl.obj @@ -1199,12 +715,8 @@ vc_mswuddll\core\generic_statusbr.obj vc_mswudll\core\generic_statusbr.obj - true - true vc_mswud\core\generic_statusbr.obj vc_mswu\core\generic_statusbr.obj - true - true @@ -1213,354 +725,12 @@ - - true - true - vc_mswunivuddll\core\univ_bmpbuttn.obj - vc_mswunivudll\core\univ_bmpbuttn.obj - true - true - vc_mswunivud\core\univ_bmpbuttn.obj - vc_mswunivu\core\univ_bmpbuttn.obj - - - true - true - vc_mswunivuddll\core\univ_button.obj - vc_mswunivudll\core\univ_button.obj - true - true - vc_mswunivud\core\univ_button.obj - vc_mswunivu\core\univ_button.obj - - - true - true - vc_mswunivuddll\core\univ_checkbox.obj - vc_mswunivudll\core\univ_checkbox.obj - true - true - vc_mswunivud\core\univ_checkbox.obj - vc_mswunivu\core\univ_checkbox.obj - - - true - true - vc_mswunivuddll\core\univ_checklst.obj - vc_mswunivudll\core\univ_checklst.obj - true - true - vc_mswunivud\core\univ_checklst.obj - vc_mswunivu\core\univ_checklst.obj - - - true - true - vc_mswunivuddll\core\univ_choice.obj - vc_mswunivudll\core\univ_choice.obj - true - true - vc_mswunivud\core\univ_choice.obj - vc_mswunivu\core\univ_choice.obj - - - true - true - vc_mswunivuddll\core\univ_combobox.obj - vc_mswunivudll\core\univ_combobox.obj - true - true - vc_mswunivud\core\univ_combobox.obj - vc_mswunivu\core\univ_combobox.obj - - - true - true - vc_mswunivuddll\core\univ_control.obj - vc_mswunivudll\core\univ_control.obj - true - true - vc_mswunivud\core\univ_control.obj - vc_mswunivu\core\univ_control.obj - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_dialog.obj - vc_mswunivudll\core\univ_dialog.obj - true - true - vc_mswunivud\core\univ_dialog.obj - vc_mswunivu\core\univ_dialog.obj - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_gauge.obj - vc_mswunivudll\core\univ_gauge.obj - true - true - vc_mswunivud\core\univ_gauge.obj - vc_mswunivu\core\univ_gauge.obj - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_listbox.obj - vc_mswunivudll\core\univ_listbox.obj - true - true - vc_mswunivud\core\univ_listbox.obj - vc_mswunivu\core\univ_listbox.obj - - - true - true - vc_mswunivuddll\core\univ_menu.obj - vc_mswunivudll\core\univ_menu.obj - true - true - vc_mswunivud\core\univ_menu.obj - vc_mswunivu\core\univ_menu.obj - - - true - true - true - true - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_notebook.obj - vc_mswunivudll\core\univ_notebook.obj - true - true - vc_mswunivud\core\univ_notebook.obj - vc_mswunivu\core\univ_notebook.obj - - - true - true - vc_mswunivuddll\core\univ_radiobox.obj - vc_mswunivudll\core\univ_radiobox.obj - true - true - vc_mswunivud\core\univ_radiobox.obj - vc_mswunivu\core\univ_radiobox.obj - - - true - true - vc_mswunivuddll\core\univ_radiobut.obj - vc_mswunivudll\core\univ_radiobut.obj - true - true - vc_mswunivud\core\univ_radiobut.obj - vc_mswunivu\core\univ_radiobut.obj - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_scrolbar.obj - vc_mswunivudll\core\univ_scrolbar.obj - true - true - vc_mswunivud\core\univ_scrolbar.obj - vc_mswunivu\core\univ_scrolbar.obj - - - true - true - true - true - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_slider.obj - vc_mswunivudll\core\univ_slider.obj - true - true - vc_mswunivud\core\univ_slider.obj - vc_mswunivu\core\univ_slider.obj - - - true - true - vc_mswunivuddll\core\univ_spinbutt.obj - vc_mswunivudll\core\univ_spinbutt.obj - true - true - vc_mswunivud\core\univ_spinbutt.obj - vc_mswunivu\core\univ_spinbutt.obj - - - true - true - vc_mswunivuddll\core\univ_statbmp.obj - vc_mswunivudll\core\univ_statbmp.obj - true - true - vc_mswunivud\core\univ_statbmp.obj - vc_mswunivu\core\univ_statbmp.obj - - - true - true - vc_mswunivuddll\core\univ_statbox.obj - vc_mswunivudll\core\univ_statbox.obj - true - true - vc_mswunivud\core\univ_statbox.obj - vc_mswunivu\core\univ_statbox.obj - - - true - true - vc_mswunivuddll\core\univ_statline.obj - vc_mswunivudll\core\univ_statline.obj - true - true - vc_mswunivud\core\univ_statline.obj - vc_mswunivu\core\univ_statline.obj - - - true - true - vc_mswunivuddll\core\univ_stattext.obj - vc_mswunivudll\core\univ_stattext.obj - true - true - vc_mswunivud\core\univ_stattext.obj - vc_mswunivu\core\univ_stattext.obj - - - true - true - vc_mswunivuddll\core\univ_statusbr.obj - vc_mswunivudll\core\univ_statusbr.obj - true - true - vc_mswunivud\core\univ_statusbr.obj - vc_mswunivu\core\univ_statusbr.obj - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_textctrl.obj - vc_mswunivudll\core\univ_textctrl.obj - true - true - vc_mswunivud\core\univ_textctrl.obj - vc_mswunivu\core\univ_textctrl.obj - - - true - true - vc_mswunivuddll\core\univ_tglbtn.obj - vc_mswunivudll\core\univ_tglbtn.obj - true - true - vc_mswunivud\core\univ_tglbtn.obj - vc_mswunivu\core\univ_tglbtn.obj - - - true - true - true - true - - - true - true - vc_mswunivuddll\core\univ_toolbar.obj - vc_mswunivudll\core\univ_toolbar.obj - true - true - vc_mswunivud\core\univ_toolbar.obj - vc_mswunivu\core\univ_toolbar.obj - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - true true - true - true @@ -1578,20 +748,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - @@ -1652,14 +808,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -1668,14 +816,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -1804,49 +944,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/msw/wx_vc10_core.vcxproj.filters b/build/msw/wx_vc10_core.vcxproj.filters index c7d5aad0b5..a955d48999 100644 --- a/build/msw/wx_vc10_core.vcxproj.filters +++ b/build/msw/wx_vc10_core.vcxproj.filters @@ -10,9 +10,6 @@ {FEA0C02F-F300-53BA-B784-52A5086B8093} - - {6F354595-5EA6-5848-AAA1-6C4820DE7AEE} - {63537534-1833-5C1F-8DBD-359A84F294C8} @@ -22,9 +19,6 @@ {61C63C83-EF8C-51CA-A418-51936E7FCD4A} - - {46168D7C-2783-50F3-AE9D-A740D5FF0B44} - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} @@ -897,126 +891,6 @@ Generic Sources - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - - - wxUniv Sources - MSW Sources @@ -1570,135 +1444,6 @@ Generic Headers - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - - - wxUniv Headers - wxHTML Headers @@ -2784,9 +2529,6 @@ Setup Headers - - Setup Headers - MSW Headers diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index adf9f5b89c..b45c844f0b 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - gl {DA8B15EF-6750-5928-BC0E-C748213CF9B2} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\gl\ ..\..\lib\vc_lib\ vc_mswu\gl\ - ..\..\lib\vc_lib\ - vc_mswunivud\gl\ - ..\..\lib\vc_lib\ - vc_mswunivu\gl\ ..\..\lib\vc_dll\ vc_mswuddll\gl\ true @@ -125,18 +73,8 @@ vc_mswudll\gl\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\gl\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\gl\ - false - true wxmsw29ud_gl $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_gllib.pch - vc_mswunivud\gl\ - ..\..\lib\vc_lib\wxmswuniv29ud_gl.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_gl.lib - true - - - ..\..\lib\vc_lib\wx_vc9_gl.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_gllib.pch - vc_mswunivu\gl\ - ..\..\lib\vc_lib\wxmswuniv29u_gl.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_gl.lib - true - - - ..\..\lib\vc_lib\wx_vc9_gl.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_gldll.pch - vc_mswunivuddll\gl\ - ..\..\lib\vc_dll\wxmswuniv295ud_gl_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;wxmswuniv29ud_core.lib;wxbase29ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_gl_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_gl.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_gl_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_gl.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_gldll.pch - vc_mswunivudll\gl\ - ..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;wxmswuniv29u_core.lib;wxbase29u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_gl.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_gl_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_gl.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -484,8 +254,6 @@ true true - true - true @@ -503,20 +271,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -526,14 +280,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -542,14 +288,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -557,4 +295,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_gl.vcxproj.filters b/build/msw/wx_vc10_gl.vcxproj.filters index 9aa8eca7ce..7425caae50 100644 --- a/build/msw/wx_vc10_gl.vcxproj.filters +++ b/build/msw/wx_vc10_gl.vcxproj.filters @@ -45,11 +45,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index 020d511b01..c79b45aeca 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - html {33CC42F9-7756-5587-863C-8D4461B7C5DD} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\html\ ..\..\lib\vc_lib\ vc_mswu\html\ - ..\..\lib\vc_lib\ - vc_mswunivud\html\ - ..\..\lib\vc_lib\ - vc_mswunivu\html\ ..\..\lib\vc_dll\ vc_mswuddll\html\ true @@ -125,18 +73,8 @@ vc_mswudll\html\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\html\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\html\ - false - true wxmsw29ud_html $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_htmllib.pch - vc_mswunivud\html\ - ..\..\lib\vc_lib\wxmswuniv29ud_html.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_html.lib - true - - - ..\..\lib\vc_lib\wx_vc9_html.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_htmllib.pch - vc_mswunivu\html\ - ..\..\lib\vc_lib\wxmswuniv29u_html.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_html.lib - true - - - ..\..\lib\vc_lib\wx_vc9_html.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_htmldll.pch - vc_mswunivuddll\html\ - ..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_html.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_html.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_htmldll.pch - vc_mswunivudll\html\ - ..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_html.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_html.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -508,8 +278,6 @@ true true - true - true @@ -527,20 +295,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -550,14 +304,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -566,14 +312,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -598,4 +336,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_html.vcxproj.filters b/build/msw/wx_vc10_html.vcxproj.filters index a640ffba98..0ec72a4a42 100644 --- a/build/msw/wx_vc10_html.vcxproj.filters +++ b/build/msw/wx_vc10_html.vcxproj.filters @@ -177,11 +177,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index 82f1de9835..44798a8c43 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - media {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\media\ ..\..\lib\vc_lib\ vc_mswu\media\ - ..\..\lib\vc_lib\ - vc_mswunivud\media\ - ..\..\lib\vc_lib\ - vc_mswunivu\media\ ..\..\lib\vc_dll\ vc_mswuddll\media\ true @@ -125,18 +73,8 @@ vc_mswudll\media\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\media\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\media\ - false - true wxmsw29ud_media $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_medialib.pch - vc_mswunivud\media\ - ..\..\lib\vc_lib\wxmswuniv29ud_media.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_media.lib - true - - - ..\..\lib\vc_lib\wx_vc9_media.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_medialib.pch - vc_mswunivu\media\ - ..\..\lib\vc_lib\wxmswuniv29u_media.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_media.lib - true - - - ..\..\lib\vc_lib\wx_vc9_media.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_mediadll.pch - vc_mswunivuddll\media\ - ..\..\lib\vc_dll\wxmswuniv295ud_media_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_media_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_media.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_media_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_media.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_mediadll.pch - vc_mswunivudll\media\ - ..\..\lib\vc_dll\wxmswuniv295u_media_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_media_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_media.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_media_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_media.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -486,8 +256,6 @@ true true - true - true @@ -505,20 +273,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -528,14 +282,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -544,18 +290,10 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_media.vcxproj.filters b/build/msw/wx_vc10_media.vcxproj.filters index 247411198d..86c8194d48 100644 --- a/build/msw/wx_vc10_media.vcxproj.filters +++ b/build/msw/wx_vc10_media.vcxproj.filters @@ -48,11 +48,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index be17cfd4ec..898dee47f9 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - net {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\net\ ..\..\lib\vc_lib\ vc_mswu\net\ - ..\..\lib\vc_lib\ - vc_mswunivud\net\ - ..\..\lib\vc_lib\ - vc_mswunivu\net\ ..\..\lib\vc_dll\ vc_mswuddll\net\ true @@ -125,18 +73,8 @@ vc_mswudll\net\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\net\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\net\ - false - true wxbase29ud_net $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_netlib.pch - vc_mswunivud\net\ - ..\..\lib\vc_lib\wxbase29ud_net.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29ud_net.lib - true - - - ..\..\lib\vc_lib\wx_vc9_net.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_netlib.pch - vc_mswunivu\net\ - ..\..\lib\vc_lib\wxbase29u_net.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29u_net.lib - true - - - ..\..\lib\vc_lib\wx_vc9_net.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_netdll.pch - vc_mswunivuddll\net\ - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud_net.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295ud_net_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_net.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_netdll.pch - vc_mswunivudll\net\ - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u_net.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295u_net_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_net.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -494,8 +264,6 @@ true true - true - true @@ -513,20 +281,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -536,14 +290,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -552,14 +298,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -576,4 +314,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_net.vcxproj.filters b/build/msw/wx_vc10_net.vcxproj.filters index 5864bd0eb2..a035d90fe4 100644 --- a/build/msw/wx_vc10_net.vcxproj.filters +++ b/build/msw/wx_vc10_net.vcxproj.filters @@ -102,11 +102,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index f52a87f469..17c7952c97 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - propgrid {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\propgrid\ ..\..\lib\vc_lib\ vc_mswu\propgrid\ - ..\..\lib\vc_lib\ - vc_mswunivud\propgrid\ - ..\..\lib\vc_lib\ - vc_mswunivu\propgrid\ ..\..\lib\vc_dll\ vc_mswuddll\propgrid\ true @@ -125,18 +73,8 @@ vc_mswudll\propgrid\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\propgrid\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\propgrid\ - false - true wxmsw29ud_propgrid $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_propgridlib.pch - vc_mswunivud\propgrid\ - ..\..\lib\vc_lib\wxmswuniv29ud_propgrid.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_propgrid.lib - true - - - ..\..\lib\vc_lib\wx_vc9_propgrid.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_propgridlib.pch - vc_mswunivu\propgrid\ - ..\..\lib\vc_lib\wxmswuniv29u_propgrid.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_propgrid.lib - true - - - ..\..\lib\vc_lib\wx_vc9_propgrid.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_propgriddll.pch - vc_mswunivuddll\propgrid\ - ..\..\lib\vc_dll\wxmswuniv295ud_propgrid_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_adv.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_propgrid_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_propgrid_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_propgrid.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_propgriddll.pch - vc_mswunivudll\propgrid\ - ..\..\lib\vc_dll\wxmswuniv295u_propgrid_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_adv.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_propgrid_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_propgrid_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_propgrid.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -490,8 +260,6 @@ true true - true - true @@ -509,20 +277,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -532,14 +286,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -548,14 +294,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -570,4 +308,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_propgrid.vcxproj.filters b/build/msw/wx_vc10_propgrid.vcxproj.filters index 37db064b8d..e5bc5d5bca 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj.filters +++ b/build/msw/wx_vc10_propgrid.vcxproj.filters @@ -88,11 +88,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 89cf0b6cb0..71a4bacd41 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - qa {E21129E0-7C08-5936-9D8C-0D60B5319BA7} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\qa\ ..\..\lib\vc_lib\ vc_mswu\qa\ - ..\..\lib\vc_lib\ - vc_mswunivud\qa\ - ..\..\lib\vc_lib\ - vc_mswunivu\qa\ ..\..\lib\vc_dll\ vc_mswuddll\qa\ true @@ -125,18 +73,8 @@ vc_mswudll\qa\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\qa\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\qa\ - false - true wxmsw29ud_qa $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_qalib.pch - vc_mswunivud\qa\ - ..\..\lib\vc_lib\wxmswuniv29ud_qa.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_qa.lib - true - - - ..\..\lib\vc_lib\wx_vc9_qa.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_qalib.pch - vc_mswunivu\qa\ - ..\..\lib\vc_lib\wxmswuniv29u_qa.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_qa.lib - true - - - ..\..\lib\vc_lib\wx_vc9_qa.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) @@ -376,107 +240,13 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_qadll.pch - vc_mswunivuddll\qa\ - ..\..\lib\vc_dll\wxmswuniv295ud_qa_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_qa_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_qa.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_qa_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_qa.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_qadll.pch - vc_mswunivudll\qa\ - ..\..\lib\vc_dll\wxmswuniv295u_qa_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_qa_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_qa.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_qa_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_qa.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -484,8 +254,6 @@ true true - true - true @@ -503,20 +271,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -526,14 +280,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -542,18 +288,10 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_qa.vcxproj.filters b/build/msw/wx_vc10_qa.vcxproj.filters index 07f6113270..6f46761f46 100644 --- a/build/msw/wx_vc10_qa.vcxproj.filters +++ b/build/msw/wx_vc10_qa.vcxproj.filters @@ -45,11 +45,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index ed4ff66f3d..4b300d9cac 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - ribbon {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\ribbon\ ..\..\lib\vc_lib\ vc_mswu\ribbon\ - ..\..\lib\vc_lib\ - vc_mswunivud\ribbon\ - ..\..\lib\vc_lib\ - vc_mswunivu\ribbon\ ..\..\lib\vc_dll\ vc_mswuddll\ribbon\ true @@ -125,18 +73,8 @@ vc_mswudll\ribbon\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\ribbon\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\ribbon\ - false - true wxmsw29ud_ribbon $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_ribbonlib.pch - vc_mswunivud\ribbon\ - ..\..\lib\vc_lib\wxmswuniv29ud_ribbon.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_ribbon.lib - true - - - ..\..\lib\vc_lib\wx_vc9_ribbon.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_ribbonlib.pch - vc_mswunivu\ribbon\ - ..\..\lib\vc_lib\wxmswuniv29u_ribbon.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_ribbon.lib - true - - - ..\..\lib\vc_lib\wx_vc9_ribbon.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_ribbondll.pch - vc_mswunivuddll\ribbon\ - ..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_adv.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_ribbon.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_ribbondll.pch - vc_mswunivudll\ribbon\ - ..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_adv.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_ribbon.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -492,8 +262,6 @@ true true - true - true @@ -511,20 +279,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -534,14 +288,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -550,14 +296,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -572,4 +310,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_ribbon.vcxproj.filters b/build/msw/wx_vc10_ribbon.vcxproj.filters index 944b1c763b..791686c418 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj.filters +++ b/build/msw/wx_vc10_ribbon.vcxproj.filters @@ -94,11 +94,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index c31971a8c9..e4ecb44f07 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - richtext {7FB0902D-8579-5DCE-B883-DAF66A885005} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\richtext\ ..\..\lib\vc_lib\ vc_mswu\richtext\ - ..\..\lib\vc_lib\ - vc_mswunivud\richtext\ - ..\..\lib\vc_lib\ - vc_mswunivu\richtext\ ..\..\lib\vc_dll\ vc_mswuddll\richtext\ true @@ -125,18 +73,8 @@ vc_mswudll\richtext\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\richtext\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\richtext\ - false - true wxmsw29ud_richtext $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_richtextlib.pch - vc_mswunivud\richtext\ - ..\..\lib\vc_lib\wxmswuniv29ud_richtext.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_richtext.lib - true - - - ..\..\lib\vc_lib\wx_vc9_richtext.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_richtextlib.pch - vc_mswunivu\richtext\ - ..\..\lib\vc_lib\wxmswuniv29u_richtext.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_richtext.lib - true - - - ..\..\lib\vc_lib\wx_vc9_richtext.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_richtextdll.pch - vc_mswunivuddll\richtext\ - ..\..\lib\vc_dll\wxmswuniv295ud_richtext_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_adv.lib;..\..\lib\vc_dll\wxmswuniv29ud_html.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_richtext_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_richtext_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_richtext.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_richtextdll.pch - vc_mswunivudll\richtext\ - ..\..\lib\vc_dll\wxmswuniv295u_richtext_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_adv.lib;..\..\lib\vc_dll\wxmswuniv29u_html.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_richtext_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_richtext.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_richtext_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_richtext.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -492,8 +262,6 @@ true true - true - true @@ -511,20 +279,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -534,14 +288,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -550,14 +296,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -584,4 +322,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_richtext.vcxproj.filters b/build/msw/wx_vc10_richtext.vcxproj.filters index cb602d18e4..0c12699475 100644 --- a/build/msw/wx_vc10_richtext.vcxproj.filters +++ b/build/msw/wx_vc10_richtext.vcxproj.filters @@ -130,11 +130,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 365f1057a1..9ba99ac9c5 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - stc {23E1C437-A951-5943-8639-A17F3CF2E606} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\stc\ ..\..\lib\vc_lib\ vc_mswu\stc\ - ..\..\lib\vc_lib\ - vc_mswunivud\stc\ - ..\..\lib\vc_lib\ - vc_mswunivu\stc\ ..\..\lib\vc_dll\ vc_mswuddll\stc\ true @@ -125,18 +73,8 @@ vc_mswudll\stc\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\stc\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\stc\ - false - true wxmsw29ud_stc $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\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) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\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) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_stclib.pch - vc_mswunivud\stc\ - ..\..\lib\vc_lib\wxmswuniv29ud_stc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\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) - - - ..\..\lib\vc_lib\wxmswuniv29ud_stc.lib - true - - - ..\..\lib\vc_lib\wx_vc9_stc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\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) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\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) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_stclib.pch - vc_mswunivu\stc\ - ..\..\lib\vc_lib\wxmswuniv29u_stc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\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) - - - ..\..\lib\vc_lib\wxmswuniv29u_stc.lib - true - - - ..\..\lib\vc_lib\wx_vc9_stc.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\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) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\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) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_stcdll.pch - vc_mswunivuddll\stc\ - ..\..\lib\vc_dll\wxmswuniv295ud_stc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxscintillad.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_stc_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_stc.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_stc_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_stc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\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) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\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) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_stcdll.pch - vc_mswunivudll\stc\ - ..\..\lib\vc_dll\wxmswuniv295u_stc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxscintilla.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_stc_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_stc.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_stc_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_stc.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -485,8 +255,6 @@ true true - true - true @@ -504,20 +272,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -527,14 +281,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -543,14 +289,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -563,4 +301,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_stc.vcxproj.filters b/build/msw/wx_vc10_stc.vcxproj.filters index a2b545734c..ad555d0c97 100644 --- a/build/msw/wx_vc10_stc.vcxproj.filters +++ b/build/msw/wx_vc10_stc.vcxproj.filters @@ -49,11 +49,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index 19839c9fab..d7ae8f1ae5 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - webview {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\webview\ ..\..\lib\vc_lib\ vc_mswu\webview\ - ..\..\lib\vc_lib\ - vc_mswunivud\webview\ - ..\..\lib\vc_lib\ - vc_mswunivu\webview\ ..\..\lib\vc_dll\ vc_mswuddll\webview\ true @@ -125,18 +73,8 @@ vc_mswudll\webview\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\webview\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\webview\ - false - true wxmsw29ud_webview $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_webviewlib.pch - vc_mswunivud\webview\ - ..\..\lib\vc_lib\wxmswuniv29ud_webview.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_webview.lib - true - - - ..\..\lib\vc_lib\wx_vc9_webview.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_webviewlib.pch - vc_mswunivu\webview\ - ..\..\lib\vc_lib\wxmswuniv29u_webview.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_webview.lib - true - - - ..\..\lib\vc_lib\wx_vc9_webview.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_webviewdll.pch - vc_mswunivuddll\webview\ - ..\..\lib\vc_dll\wxmswuniv295ud_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_webview_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_webview.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_webview_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_webview.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_webviewdll.pch - vc_mswunivudll\webview\ - ..\..\lib\vc_dll\wxmswuniv295u_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_webview_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_webview.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_webview_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_webview.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -485,8 +255,6 @@ true true - true - true @@ -504,20 +272,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -527,14 +281,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -543,14 +289,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -560,4 +298,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_webview.vcxproj.filters b/build/msw/wx_vc10_webview.vcxproj.filters index 840b77a898..4d66e70ac2 100644 --- a/build/msw/wx_vc10_webview.vcxproj.filters +++ b/build/msw/wx_vc10_webview.vcxproj.filters @@ -54,11 +54,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_wxexpat.vcxproj b/build/msw/wx_vc10_wxexpat.vcxproj index 6559fd29ba..eea2b9e72f 100644 --- a/build/msw/wx_vc10_wxexpat.vcxproj +++ b/build/msw/wx_vc10_wxexpat.vcxproj @@ -13,40 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxexpat {A1A8355B-0988-528E-9CC2-B971D6266669} - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -55,14 +31,6 @@ StaticLibrary false - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -74,24 +42,12 @@ - - - - - - - - - - - - @@ -105,22 +61,12 @@ vc_mswud\wxexpat\ ..\..\lib\vc_lib\ vc_mswu\wxexpat\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxexpat\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxexpat\ ..\..\lib\vc_dll\ vc_mswuddll\wxexpat\ ..\..\lib\vc_dll\ vc_mswudll\wxexpat\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxexpat\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxexpat\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -190,74 +136,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxexpat\ - ..\..\lib\vc_lib\wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxexpatd.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxexpat\ - ..\..\lib\vc_lib\wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxexpat.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxexpat.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) @@ -326,74 +204,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxexpat\ - ..\..\lib\vc_dll\wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxexpatd.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxexpat\ - ..\..\lib\vc_dll\wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxexpat.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxexpat.bsc - true - - diff --git a/build/msw/wx_vc10_wxjpeg.vcxproj b/build/msw/wx_vc10_wxjpeg.vcxproj index 681fd23e27..2b5694ca6e 100644 --- a/build/msw/wx_vc10_wxjpeg.vcxproj +++ b/build/msw/wx_vc10_wxjpeg.vcxproj @@ -13,40 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxjpeg {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -55,14 +31,6 @@ StaticLibrary false - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -74,24 +42,12 @@ - - - - - - - - - - - - @@ -105,22 +61,12 @@ vc_mswud\wxjpeg\ ..\..\lib\vc_lib\ vc_mswu\wxjpeg\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxjpeg\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxjpeg\ ..\..\lib\vc_dll\ vc_mswuddll\wxjpeg\ ..\..\lib\vc_dll\ vc_mswudll\wxjpeg\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxjpeg\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxjpeg\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -190,74 +136,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxjpeg\ - ..\..\lib\vc_lib\wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxjpegd.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxjpeg\ - ..\..\lib\vc_lib\wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxjpeg.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxjpeg.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -326,74 +204,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxjpeg\ - ..\..\lib\vc_dll\wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxjpegd.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxjpeg\ - ..\..\lib\vc_dll\wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxjpeg.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxjpeg.bsc - true - - diff --git a/build/msw/wx_vc10_wxpng.vcxproj b/build/msw/wx_vc10_wxpng.vcxproj index 63e9206bda..fcba67d325 100644 --- a/build/msw/wx_vc10_wxpng.vcxproj +++ b/build/msw/wx_vc10_wxpng.vcxproj @@ -13,40 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxpng {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -55,14 +31,6 @@ StaticLibrary false - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -74,24 +42,12 @@ - - - - - - - - - - - - @@ -105,22 +61,12 @@ vc_mswud\wxpng\ ..\..\lib\vc_lib\ vc_mswu\wxpng\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxpng\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxpng\ ..\..\lib\vc_dll\ vc_mswuddll\wxpng\ ..\..\lib\vc_dll\ vc_mswudll\wxpng\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxpng\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxpng\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -190,74 +136,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxpng\ - ..\..\lib\vc_lib\wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxpngd.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxpng\ - ..\..\lib\vc_lib\wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxpng.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxpng.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -326,74 +204,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxpng\ - ..\..\lib\vc_dll\wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxpngd.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxpng\ - ..\..\lib\vc_dll\wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxpng.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxpng.bsc - true - - diff --git a/build/msw/wx_vc10_wxregex.vcxproj b/build/msw/wx_vc10_wxregex.vcxproj index d4bd57931d..f154c91bcc 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj +++ b/build/msw/wx_vc10_wxregex.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxregex {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,26 +65,14 @@ vc_mswud\wxregex\ ..\..\lib\vc_lib\ vc_mswu\wxregex\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxregex\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxregex\ ..\..\lib\vc_dll\ vc_mswuddll\wxregex\ ..\..\lib\vc_dll\ vc_mswudll\wxregex\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxregex\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxregex\ $(ProjectName)ud $(ProjectName)ud - $(ProjectName)ud - $(ProjectName)ud $(ProjectName)u - $(ProjectName)u $(ProjectName)u - $(ProjectName)u @@ -202,74 +142,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxregex\ - ..\..\lib\vc_lib\wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;..\..\lib\vc_lib\mswunivud;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxregexud.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxregex\ - ..\..\lib\vc_lib\wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;..\..\lib\vc_lib\mswunivu;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxregexu.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxregex.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) @@ -338,74 +210,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxregex\ - ..\..\lib\vc_dll\wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;..\..\lib\vc_dll\mswunivud;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxregexud.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxregex\ - ..\..\lib\vc_dll\wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;..\..\lib\vc_dll\mswunivu;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxregexu.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxregex.bsc - true - - @@ -422,14 +226,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -438,14 +234,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_dll\mswud\wx\setup.h @@ -461,22 +249,8 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - - \ No newline at end of file + diff --git a/build/msw/wx_vc10_wxregex.vcxproj.filters b/build/msw/wx_vc10_wxregex.vcxproj.filters index cc71f47091..13f1956e2b 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj.filters +++ b/build/msw/wx_vc10_wxregex.vcxproj.filters @@ -31,8 +31,5 @@ Header Files - - Header Files - - \ No newline at end of file + diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj b/build/msw/wx_vc10_wxscintilla.vcxproj index cfc0f38c34..6d0c7bc17a 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj +++ b/build/msw/wx_vc10_wxscintilla.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxscintilla {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,22 +65,12 @@ vc_mswud\wxscintilla\ ..\..\lib\vc_lib\ vc_mswu\wxscintilla\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxscintilla\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxscintilla\ ..\..\lib\vc_dll\ vc_mswuddll\wxscintilla\ ..\..\lib\vc_dll\ vc_mswudll\wxscintilla\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxscintilla\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxscintilla\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -198,74 +140,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxscintilla\ - ..\..\lib\vc_lib\wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxscintillad.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxscintilla\ - ..\..\lib\vc_lib\wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxscintilla.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) @@ -334,74 +208,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxscintilla\ - ..\..\lib\vc_dll\wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxscintillad.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxscintilla\ - ..\..\lib\vc_dll\wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxscintilla.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc - true - - @@ -533,14 +339,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -549,14 +347,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_dll\mswud\wx\setup.h @@ -572,22 +362,8 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - - \ No newline at end of file + diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj.filters b/build/msw/wx_vc10_wxscintilla.vcxproj.filters index 1c52f23284..81f348d5c1 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj.filters +++ b/build/msw/wx_vc10_wxscintilla.vcxproj.filters @@ -376,8 +376,5 @@ Header Files - - Header Files - - \ No newline at end of file + diff --git a/build/msw/wx_vc10_wxtiff.vcxproj b/build/msw/wx_vc10_wxtiff.vcxproj index 048920ff8f..ba42849fa9 100644 --- a/build/msw/wx_vc10_wxtiff.vcxproj +++ b/build/msw/wx_vc10_wxtiff.vcxproj @@ -13,40 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxtiff {75596CE6-5AE7-55C9-B890-C07B0A657A83} - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -55,14 +31,6 @@ StaticLibrary false - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -74,24 +42,12 @@ - - - - - - - - - - - - @@ -105,22 +61,12 @@ vc_mswud\wxtiff\ ..\..\lib\vc_lib\ vc_mswu\wxtiff\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxtiff\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxtiff\ ..\..\lib\vc_dll\ vc_mswuddll\wxtiff\ ..\..\lib\vc_dll\ vc_mswudll\wxtiff\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxtiff\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxtiff\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -190,74 +136,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxtiff\ - ..\..\lib\vc_lib\wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxtiffd.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxtiff\ - ..\..\lib\vc_lib\wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxtiff.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxtiff.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) @@ -326,74 +204,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxtiff\ - ..\..\lib\vc_dll\wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxtiffd.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxtiff\ - ..\..\lib\vc_dll\wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxtiff.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxtiff.bsc - true - - diff --git a/build/msw/wx_vc10_wxzlib.vcxproj b/build/msw/wx_vc10_wxzlib.vcxproj index 36699dfc15..661f77e8a2 100644 --- a/build/msw/wx_vc10_wxzlib.vcxproj +++ b/build/msw/wx_vc10_wxzlib.vcxproj @@ -13,40 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - wxzlib {8B867186-A0B5-5479-B824-E176EDD27C40} - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -55,14 +31,6 @@ StaticLibrary false - - StaticLibrary - false - - - StaticLibrary - false - StaticLibrary false @@ -74,24 +42,12 @@ - - - - - - - - - - - - @@ -105,22 +61,12 @@ vc_mswud\wxzlib\ ..\..\lib\vc_lib\ vc_mswu\wxzlib\ - ..\..\lib\vc_lib\ - vc_mswunivud\wxzlib\ - ..\..\lib\vc_lib\ - vc_mswunivu\wxzlib\ ..\..\lib\vc_dll\ vc_mswuddll\wxzlib\ ..\..\lib\vc_dll\ vc_mswudll\wxzlib\ - ..\..\lib\vc_dll\ - vc_mswunivuddll\wxzlib\ - ..\..\lib\vc_dll\ - vc_mswunivudll\wxzlib\ $(ProjectName)d $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -190,74 +136,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivud\wxzlib\ - ..\..\lib\vc_lib\wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxzlibd.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivu\wxzlib\ - ..\..\lib\vc_lib\wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxzlib.lib - true - - - ..\..\lib\vc_lib\wx_vc9_wxzlib.bsc - true - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -326,74 +204,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - vc_mswunivuddll\wxzlib\ - ..\..\lib\vc_dll\wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxzlibd.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - vc_mswunivudll\wxzlib\ - ..\..\lib\vc_dll\wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - ..\..\lib\vc_dll\wxzlib.lib - true - - - ..\..\lib\vc_dll\wx_vc9_wxzlib.bsc - true - - diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index 4b1a5e7e25..eed69570fd 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - xml {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\xml\ ..\..\lib\vc_lib\ vc_mswu\xml\ - ..\..\lib\vc_lib\ - vc_mswunivud\xml\ - ..\..\lib\vc_lib\ - vc_mswunivu\xml\ ..\..\lib\vc_dll\ vc_mswuddll\xml\ true @@ -125,18 +73,8 @@ vc_mswudll\xml\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\xml\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\xml\ - false - true wxbase29ud_xml $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_xmllib.pch - vc_mswunivud\xml\ - ..\..\lib\vc_lib\wxbase29ud_xml.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29ud_xml.lib - true - - - ..\..\lib\vc_lib\wx_vc9_xml.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_xmllib.pch - vc_mswunivu\xml\ - ..\..\lib\vc_lib\wxbase29u_xml.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxbase29u_xml.lib - true - - - ..\..\lib\vc_lib\wx_vc9_xml.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_xmldll.pch - vc_mswunivuddll\xml\ - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.dll - ..\..\lib\vc_dll\wxbase29ud_xml.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295ud_xml_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_xml.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_xmldll.pch - vc_mswunivudll\xml\ - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.dll - ..\..\lib\vc_dll\wxbase29u_xml.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxbase295u_xml_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_xml.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -484,8 +254,6 @@ true true - true - true @@ -503,20 +271,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -526,14 +280,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -542,14 +288,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -557,4 +295,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_xml.vcxproj.filters b/build/msw/wx_vc10_xml.vcxproj.filters index b2d1f9d4ad..294ba1105e 100644 --- a/build/msw/wx_vc10_xml.vcxproj.filters +++ b/build/msw/wx_vc10_xml.vcxproj.filters @@ -49,11 +49,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 8d4d15e507..1b79c1019a 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -13,42 +13,16 @@ DLL Release Win32 - - DLL Universal Debug - Win32 - - - DLL Universal Release - Win32 - Release Win32 - - Universal Debug - Win32 - - - Universal Release - Win32 - xrc {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - DynamicLibrary false @@ -59,16 +33,6 @@ false Unicode - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - StaticLibrary false @@ -82,24 +46,12 @@ - - - - - - - - - - - - @@ -113,10 +65,6 @@ vc_mswud\xrc\ ..\..\lib\vc_lib\ vc_mswu\xrc\ - ..\..\lib\vc_lib\ - vc_mswunivud\xrc\ - ..\..\lib\vc_lib\ - vc_mswunivu\xrc\ ..\..\lib\vc_dll\ vc_mswuddll\xrc\ true @@ -125,18 +73,8 @@ vc_mswudll\xrc\ false true - ..\..\lib\vc_dll\ - vc_mswunivuddll\xrc\ - true - true - ..\..\lib\vc_dll\ - vc_mswunivudll\xrc\ - false - true wxmsw29ud_xrc $(ProjectName)d - $(ProjectName)d - $(ProjectName)d @@ -212,80 +150,6 @@ true - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivud\wxprec_xrclib.pch - vc_mswunivud\xrc\ - ..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib - true - - - ..\..\lib\vc_lib\wx_vc9_xrc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivu\wxprec_xrclib.pch - vc_mswunivu\xrc\ - ..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - ..\..\lib\vc_lib\wxmswuniv29u_xrc.lib - true - - - ..\..\lib\vc_lib\wx_vc9_xrc.bsc - true - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) @@ -376,106 +240,12 @@ true - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswunivuddll\wxprec_xrcdll.pch - vc_mswunivuddll\xrc\ - ..\..\lib\vc_dll\wxmswuniv295ud_xrc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivud;..\..\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;..\..\lib\vc_dll\wxmswuniv29ud_html.lib;..\..\lib\vc_dll\wxmswuniv29ud_adv.lib;..\..\lib\vc_dll\wxmswuniv29ud_core.lib;..\..\lib\vc_dll\wxbase29ud_xml.lib;..\..\lib\vc_dll\wxbase29ud.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295ud_xrc_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295ud_xrc_vc_custom.pdb - MachineX86 - - - ..\..\lib\vc_dll\wx_vc9_xrc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswunivudll\wxprec_xrcdll.pch - vc_mswunivudll\xrc\ - ..\..\lib\vc_dll\wxmswuniv295u_xrc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - ..\..\lib\vc_dll\mswunivu;..\..\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;..\..\lib\vc_dll\wxmswuniv29u_html.lib;..\..\lib\vc_dll\wxmswuniv29u_adv.lib;..\..\lib\vc_dll\wxmswuniv29u_core.lib;..\..\lib\vc_dll\wxbase29u_xml.lib;..\..\lib\vc_dll\wxbase29u.lib;%(AdditionalDependencies) - ..\..\lib\vc_dll\wxmswuniv295u_xrc_vc_custom.dll - ..\..\lib\vc_dll\wxmswuniv29u_xrc.lib - true - ..\..\lib\vc_dll;%(AdditionalLibraryDirectories) - true - ..\..\lib\vc_dll\wxmswuniv295u_xrc_vc_custom.pdb - MachineX86 - true - true - - - ..\..\lib\vc_dll\wx_vc9_xrc.bsc - true - - Create Create - Create - Create Create Create - Create - Create @@ -547,8 +317,6 @@ true true - true - true @@ -566,20 +334,6 @@ copy "%(FullPath)" ..\..\lib\vc_lib\mswu\wx\setup.h ..\..\lib\vc_lib\mswu\wx\setup.h;%(Outputs) - - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h - ..\..\lib\vc_dll\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h - ..\..\lib\vc_dll\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h - ..\..\lib\vc_lib\mswunivud\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h - copy "%(FullPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h - ..\..\lib\vc_lib\mswunivu\wx\setup.h;%(Outputs) - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" @@ -589,14 +343,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_dll\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_dll\mswunivu\wx\msw;%(AdditionalInputs) Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs) @@ -605,14 +351,6 @@ cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs) ..\..\lib\vc_lib\mswu\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivud\wx\msw;%(AdditionalInputs) - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h;%(Outputs) - ..\..\lib\vc_lib\mswunivu\wx\msw;%(AdditionalInputs) @@ -682,4 +420,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_xrc.vcxproj.filters b/build/msw/wx_vc10_xrc.vcxproj.filters index 909d6c2c0c..6742e819bf 100644 --- a/build/msw/wx_vc10_xrc.vcxproj.filters +++ b/build/msw/wx_vc10_xrc.vcxproj.filters @@ -424,11 +424,8 @@ Setup Headers - - Setup Headers - MSW Headers - \ No newline at end of file + -- 2.45.2