From ddb562a565a53a859322788554df2a6d5b8bfa5b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 26 Oct 2013 21:40:19 +0000 Subject: [PATCH 1/6] Create 3.0 release branch. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 From f1d5e29800a9ec554d93c724c1d63f153a3f42b8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Oct 2013 15:33:33 +0000 Subject: [PATCH 2/6] Add x64 platform to MSVS 10 solution and project files. Manually update VC10 projects to have both Win32 and x64 architectures, use "vc_x64" for the output directories and the DLL names under the latter. Closes #15568. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/msw/wx_vc10.sln | 188 ++++++++++++ build/msw/wx_vc10_adv.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_aui.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_base.vcxproj | 270 ++++++++++++++++- build/msw/wx_vc10_core.vcxproj | 408 +++++++++++++++++++++++++- build/msw/wx_vc10_gl.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_html.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_media.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_net.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_propgrid.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_qa.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_ribbon.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_richtext.vcxproj | 262 ++++++++++++++++- build/msw/wx_vc10_stc.vcxproj | 260 +++++++++++++++- build/msw/wx_vc10_webview.vcxproj | 262 ++++++++++++++++- 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 | 226 +++++++++++++- build/msw/wx_vc10_wxscintilla.vcxproj | 224 +++++++++++++- build/msw/wx_vc10_wxtiff.vcxproj | 190 +++++++++++- build/msw/wx_vc10_wxzlib.vcxproj | 192 +++++++++++- build/msw/wx_vc10_xml.vcxproj | 260 +++++++++++++++- build/msw/wx_vc10_xrc.vcxproj | 260 +++++++++++++++- 24 files changed, 5823 insertions(+), 107 deletions(-) diff --git a/build/msw/wx_vc10.sln b/build/msw/wx_vc10.sln index 77e59126b5..b3975e1d99 100644 --- a/build/msw/wx_vc10.sln +++ b/build/msw/wx_vc10.sln @@ -109,195 +109,383 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 DLL Debug|Win32 = DLL Debug|Win32 + DLL Debug|x64 = DLL Debug|x64 DLL Release|Win32 = DLL Release|Win32 + DLL Release|x64 = DLL Release|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 {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}.Debug|x64.ActiveCfg = Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 {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 Debug|x64.ActiveCfg = DLL Debug|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 {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 Release|x64.ActiveCfg = DLL Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 {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}.Release|x64.ActiveCfg = Release|x64 + {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/msw/wx_vc10_adv.vcxproj b/build/msw/wx_vc10_adv.vcxproj index 75c4eb3237..a37e946719 100644 --- a/build/msw/wx_vc10_adv.vcxproj +++ b/build/msw/wx_vc10_adv.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + adv @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\adv\ + vc_x64_mswud\adv\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\adv\ + vc_x64_mswu\adv\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\adv\ + vc_x64_mswuddll\adv\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\adv\ + vc_x64_mswudll\adv\ false + false true + true wxmsw30ud_adv + wxmsw30ud_adv wxmsw30u_adv + wxmsw30u_adv wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_advlib.pch - vc_mswud\adv\ + $(OutDir)wxmsw30ud_adv.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_adv.lib + true + + + $(OutDir)wx_vc9_adv.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_advlib.pch $(OutDir)wxmsw30ud_adv.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_advlib.pch - vc_mswu\adv\ + $(OutDir)wxmsw30u_adv.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_adv.lib + true + + + $(OutDir)wx_vc9_adv.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_advlib.pch $(OutDir)wxmsw30u_adv.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_advdll.pch - vc_mswuddll\adv\ $(OutDir)wxmsw30ud_adv_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_advdll.pch + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll + $(OutDir)wxmsw30ud_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_advdll.pch - vc_mswudll\adv\ $(OutDir)wxmsw30u_adv_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_advdll.pch + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_adv_vc_x64_custom.dll + $(OutDir)wxmsw30u_adv.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_adv.bsc + true + + @@ -249,9 +467,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -302,23 +524,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -327,21 +563,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -403,4 +655,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_aui.vcxproj b/build/msw/wx_vc10_aui.vcxproj index 6fc31f7ce2..8bfc1b49d5 100644 --- a/build/msw/wx_vc10_aui.vcxproj +++ b/build/msw/wx_vc10_aui.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + aui @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\aui\ + vc_x64_mswud\aui\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\aui\ + vc_x64_mswu\aui\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\aui\ + vc_x64_mswuddll\aui\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\aui\ + vc_x64_mswudll\aui\ false + false true + true wxmsw30ud_aui + wxmsw30ud_aui wxmsw30u_aui + wxmsw30u_aui wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_auilib.pch - vc_mswud\aui\ + $(OutDir)wxmsw30ud_aui.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_aui.lib + true + + + $(OutDir)wx_vc9_aui.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_auilib.pch $(OutDir)wxmsw30ud_aui.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_auilib.pch - vc_mswu\aui\ + $(OutDir)wxmsw30u_aui.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_aui.lib + true + + + $(OutDir)wx_vc9_aui.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_auilib.pch $(OutDir)wxmsw30u_aui.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_auidll.pch - vc_mswuddll\aui\ $(OutDir)wxmsw30ud_aui_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_auidll.pch + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll + $(OutDir)wxmsw30ud_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_auidll.pch - vc_mswudll\aui\ $(OutDir)wxmsw30u_aui_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_auidll.pch + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_aui_vc_x64_custom.dll + $(OutDir)wxmsw30u_aui.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_aui.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -260,41 +482,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -308,4 +560,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj index 2f86237d43..4e8ef861a2 100644 --- a/build/msw/wx_vc10_base.vcxproj +++ b/build/msw/wx_vc10_base.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + base @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\base\ + vc_x64_mswud\base\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\base\ + vc_x64_mswu\base\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\base\ + vc_x64_mswuddll\base\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\base\ + vc_x64_mswudll\base\ false + false true + true wxbase30ud + wxbase30ud wx$(ProjectName)30ud_vc_custom + wx$(ProjectName)30ud_vc_x64_custom wxbase30u + wxbase30u wx$(ProjectName)30u_vc_custom + wx$(ProjectName)30u_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_baselib.pch - vc_mswud\base\ + $(OutDir)wxbase30ud.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud.lib + true + + + $(OutDir)wx_vc9_base.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_baselib.pch $(OutDir)wxbase30ud.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_baselib.pch - vc_mswu\base\ + $(OutDir)wxbase30u.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u.lib + true + + + $(OutDir)wx_vc9_base.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_baselib.pch $(OutDir)wxbase30u.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_basedll.pch - vc_mswuddll\base\ $(OutDir)wxbase30ud_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_basedll.pch + $(OutDir)wxbase30ud_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_vc_x64_custom.dll + $(OutDir)wxbase30ud.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_basedll.pch - vc_mswudll\base\ $(OutDir)wxbase30u_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_basedll.pch + $(OutDir)wxbase30u_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_vc_x64_custom.dll + $(OutDir)wxbase30u.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_base.bsc + true + + @@ -260,9 +478,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -273,12 +495,20 @@ + + + + + + + + @@ -375,23 +605,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -404,21 +648,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -596,4 +856,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj index 077b5b6fe6..ae336c3690 100644 --- a/build/msw/wx_vc10_core.vcxproj +++ b/build/msw/wx_vc10_core.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + core @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\core\ + vc_x64_mswud\core\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\core\ + vc_x64_mswu\core\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\core\ + vc_x64_mswuddll\core\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\core\ + vc_x64_mswudll\core\ false + false true + true wxmsw30ud_core + wxmsw30ud_core wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_core + wxmsw30u_core wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_corelib.pch - vc_mswud\core\ + $(OutDir)wxmsw30ud_core.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_core.lib + true + + + $(OutDir)wx_vc9_core.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_corelib.pch $(OutDir)wxmsw30ud_core.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_corelib.pch - vc_mswu\core\ + $(OutDir)wxmsw30u_core.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_core.lib + true + + + $(OutDir)wx_vc9_core.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_corelib.pch $(OutDir)wxmsw30u_core.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_coredll.pch - vc_mswuddll\core\ $(OutDir)wxmsw30ud_core_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_coredll.pch + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_core_vc_x64_custom.dll + $(OutDir)wxmsw30ud_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_coredll.pch - vc_mswudll\core\ $(OutDir)wxmsw30u_core_vc_custom.pdb Level4 true @@ -242,6 +417,49 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_coredll.pch + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_core_vc_x64_custom.dll + $(OutDir)wxmsw30u_core.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_core_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_core.bsc + true + + @@ -284,9 +502,13 @@ Create + Create Create + Create Create + Create Create + Create @@ -383,9 +605,13 @@ vc_mswuddll\core\msw_accel.obj + vc_x64_mswuddll\core\msw_accel.obj vc_mswudll\core\msw_accel.obj + vc_x64_mswudll\core\msw_accel.obj vc_mswud\core\msw_accel.obj + vc_x64_mswud\core\msw_accel.obj vc_mswu\core\msw_accel.obj + vc_x64_mswu\core\msw_accel.obj @@ -396,35 +622,55 @@ vc_mswuddll\core\msw_bmpbuttn.obj + vc_x64_mswuddll\core\msw_bmpbuttn.obj vc_mswudll\core\msw_bmpbuttn.obj + vc_x64_mswudll\core\msw_bmpbuttn.obj vc_mswud\core\msw_bmpbuttn.obj + vc_x64_mswud\core\msw_bmpbuttn.obj vc_mswu\core\msw_bmpbuttn.obj + vc_x64_mswu\core\msw_bmpbuttn.obj vc_mswuddll\core\msw_button.obj + vc_x64_mswuddll\core\msw_button.obj vc_mswudll\core\msw_button.obj + vc_x64_mswudll\core\msw_button.obj vc_mswud\core\msw_button.obj + vc_x64_mswud\core\msw_button.obj vc_mswu\core\msw_button.obj + vc_x64_mswu\core\msw_button.obj vc_mswuddll\core\msw_checkbox.obj + vc_x64_mswuddll\core\msw_checkbox.obj vc_mswudll\core\msw_checkbox.obj + vc_x64_mswudll\core\msw_checkbox.obj vc_mswud\core\msw_checkbox.obj + vc_x64_mswud\core\msw_checkbox.obj vc_mswu\core\msw_checkbox.obj + vc_x64_mswu\core\msw_checkbox.obj vc_mswuddll\core\msw_checklst.obj + vc_x64_mswuddll\core\msw_checklst.obj vc_mswudll\core\msw_checklst.obj + vc_x64_mswudll\core\msw_checklst.obj vc_mswud\core\msw_checklst.obj + vc_x64_mswud\core\msw_checklst.obj vc_mswu\core\msw_checklst.obj + vc_x64_mswu\core\msw_checklst.obj vc_mswuddll\core\msw_choice.obj + vc_x64_mswuddll\core\msw_choice.obj vc_mswudll\core\msw_choice.obj + vc_x64_mswudll\core\msw_choice.obj vc_mswud\core\msw_choice.obj + vc_x64_mswud\core\msw_choice.obj vc_mswu\core\msw_choice.obj + vc_x64_mswu\core\msw_choice.obj @@ -432,15 +678,23 @@ vc_mswuddll\core\msw_combobox.obj + vc_x64_mswuddll\core\msw_combobox.obj vc_mswudll\core\msw_combobox.obj + vc_x64_mswudll\core\msw_combobox.obj vc_mswud\core\msw_combobox.obj + vc_x64_mswud\core\msw_combobox.obj vc_mswu\core\msw_combobox.obj + vc_x64_mswu\core\msw_combobox.obj vc_mswuddll\core\msw_control.obj + vc_x64_mswuddll\core\msw_control.obj vc_mswudll\core\msw_control.obj + vc_x64_mswudll\core\msw_control.obj vc_mswud\core\msw_control.obj + vc_x64_mswud\core\msw_control.obj vc_mswu\core\msw_control.obj + vc_x64_mswu\core\msw_control.obj @@ -452,9 +706,13 @@ vc_mswuddll\core\msw_dialog.obj + vc_x64_mswuddll\core\msw_dialog.obj vc_mswudll\core\msw_dialog.obj + vc_x64_mswudll\core\msw_dialog.obj vc_mswud\core\msw_dialog.obj + vc_x64_mswud\core\msw_dialog.obj vc_mswu\core\msw_dialog.obj + vc_x64_mswu\core\msw_dialog.obj @@ -467,9 +725,13 @@ vc_mswuddll\core\msw_fdrepdlg.obj + vc_x64_mswuddll\core\msw_fdrepdlg.obj vc_mswudll\core\msw_fdrepdlg.obj + vc_x64_mswudll\core\msw_fdrepdlg.obj vc_mswud\core\msw_fdrepdlg.obj + vc_x64_mswud\core\msw_fdrepdlg.obj vc_mswu\core\msw_fdrepdlg.obj + vc_x64_mswu\core\msw_fdrepdlg.obj @@ -479,9 +741,13 @@ vc_mswuddll\core\msw_gauge.obj + vc_x64_mswuddll\core\msw_gauge.obj vc_mswudll\core\msw_gauge.obj + vc_x64_mswudll\core\msw_gauge.obj vc_mswud\core\msw_gauge.obj + vc_x64_mswud\core\msw_gauge.obj vc_mswu\core\msw_gauge.obj + vc_x64_mswu\core\msw_gauge.obj @@ -495,23 +761,35 @@ vc_mswuddll\core\msw_listbox.obj + vc_x64_mswuddll\core\msw_listbox.obj vc_mswudll\core\msw_listbox.obj + vc_x64_mswudll\core\msw_listbox.obj vc_mswud\core\msw_listbox.obj + vc_x64_mswud\core\msw_listbox.obj vc_mswu\core\msw_listbox.obj + vc_x64_mswu\core\msw_listbox.obj vc_mswuddll\core\msw_listctrl.obj + vc_x64_mswuddll\core\msw_listctrl.obj vc_mswudll\core\msw_listctrl.obj + vc_x64_mswudll\core\msw_listctrl.obj vc_mswud\core\msw_listctrl.obj + vc_x64_mswud\core\msw_listctrl.obj vc_mswu\core\msw_listctrl.obj + vc_x64_mswu\core\msw_listctrl.obj vc_mswuddll\core\msw_menu.obj + vc_x64_mswuddll\core\msw_menu.obj vc_mswudll\core\msw_menu.obj + vc_x64_mswudll\core\msw_menu.obj vc_mswud\core\msw_menu.obj + vc_x64_mswud\core\msw_menu.obj vc_mswu\core\msw_menu.obj + vc_x64_mswu\core\msw_menu.obj @@ -523,9 +801,13 @@ vc_mswuddll\core\msw_notebook.obj + vc_x64_mswuddll\core\msw_notebook.obj vc_mswudll\core\msw_notebook.obj + vc_x64_mswudll\core\msw_notebook.obj vc_mswud\core\msw_notebook.obj + vc_x64_mswud\core\msw_notebook.obj vc_mswu\core\msw_notebook.obj + vc_x64_mswu\core\msw_notebook.obj @@ -539,88 +821,140 @@ vc_mswuddll\core\msw_radiobox.obj + vc_x64_mswuddll\core\msw_radiobox.obj vc_mswudll\core\msw_radiobox.obj + vc_x64_mswudll\core\msw_radiobox.obj vc_mswud\core\msw_radiobox.obj + vc_x64_mswud\core\msw_radiobox.obj vc_mswu\core\msw_radiobox.obj + vc_x64_mswu\core\msw_radiobox.obj vc_mswuddll\core\msw_radiobut.obj + vc_x64_mswuddll\core\msw_radiobut.obj vc_mswudll\core\msw_radiobut.obj + vc_x64_mswudll\core\msw_radiobut.obj vc_mswud\core\msw_radiobut.obj + vc_x64_mswud\core\msw_radiobut.obj vc_mswu\core\msw_radiobut.obj + vc_x64_mswu\core\msw_radiobut.obj vc_mswuddll\core\msw_scrolbar.obj + vc_x64_mswuddll\core\msw_scrolbar.obj vc_mswudll\core\msw_scrolbar.obj + vc_x64_mswudll\core\msw_scrolbar.obj vc_mswud\core\msw_scrolbar.obj + vc_x64_mswud\core\msw_scrolbar.obj vc_mswu\core\msw_scrolbar.obj + vc_x64_mswu\core\msw_scrolbar.obj vc_mswuddll\core\msw_slider.obj + vc_x64_mswuddll\core\msw_slider.obj vc_mswudll\core\msw_slider.obj + vc_x64_mswudll\core\msw_slider.obj vc_mswud\core\msw_slider.obj + vc_x64_mswud\core\msw_slider.obj vc_mswu\core\msw_slider.obj + vc_x64_mswu\core\msw_slider.obj vc_mswuddll\core\msw_spinbutt.obj + vc_x64_mswuddll\core\msw_spinbutt.obj vc_mswudll\core\msw_spinbutt.obj + vc_x64_mswudll\core\msw_spinbutt.obj vc_mswud\core\msw_spinbutt.obj + vc_x64_mswud\core\msw_spinbutt.obj vc_mswu\core\msw_spinbutt.obj + vc_x64_mswu\core\msw_spinbutt.obj vc_mswuddll\core\msw_statbmp.obj + vc_x64_mswuddll\core\msw_statbmp.obj vc_mswudll\core\msw_statbmp.obj + vc_x64_mswudll\core\msw_statbmp.obj vc_mswud\core\msw_statbmp.obj + vc_x64_mswud\core\msw_statbmp.obj vc_mswu\core\msw_statbmp.obj + vc_x64_mswu\core\msw_statbmp.obj vc_mswuddll\core\msw_statbox.obj + vc_x64_mswuddll\core\msw_statbox.obj vc_mswudll\core\msw_statbox.obj + vc_x64_mswudll\core\msw_statbox.obj vc_mswud\core\msw_statbox.obj + vc_x64_mswud\core\msw_statbox.obj vc_mswu\core\msw_statbox.obj + vc_x64_mswu\core\msw_statbox.obj vc_mswuddll\core\msw_statline.obj + vc_x64_mswuddll\core\msw_statline.obj vc_mswudll\core\msw_statline.obj + vc_x64_mswudll\core\msw_statline.obj vc_mswud\core\msw_statline.obj + vc_x64_mswud\core\msw_statline.obj vc_mswu\core\msw_statline.obj + vc_x64_mswu\core\msw_statline.obj vc_mswuddll\core\msw_stattext.obj + vc_x64_mswuddll\core\msw_stattext.obj vc_mswudll\core\msw_stattext.obj + vc_x64_mswudll\core\msw_stattext.obj vc_mswud\core\msw_stattext.obj + vc_x64_mswud\core\msw_stattext.obj vc_mswu\core\msw_stattext.obj + vc_x64_mswu\core\msw_stattext.obj vc_mswuddll\core\msw_textctrl.obj + vc_x64_mswuddll\core\msw_textctrl.obj vc_mswudll\core\msw_textctrl.obj + vc_x64_mswudll\core\msw_textctrl.obj vc_mswud\core\msw_textctrl.obj + vc_x64_mswud\core\msw_textctrl.obj vc_mswu\core\msw_textctrl.obj + vc_x64_mswu\core\msw_textctrl.obj vc_mswuddll\core\msw_textmeasure.obj + vc_x64_mswuddll\core\msw_textmeasure.obj vc_mswudll\core\msw_textmeasure.obj + vc_x64_mswudll\core\msw_textmeasure.obj vc_mswud\core\msw_textmeasure.obj + vc_x64_mswud\core\msw_textmeasure.obj vc_mswu\core\msw_textmeasure.obj + vc_x64_mswu\core\msw_textmeasure.obj vc_mswuddll\core\msw_tglbtn.obj + vc_x64_mswuddll\core\msw_tglbtn.obj vc_mswudll\core\msw_tglbtn.obj + vc_x64_mswudll\core\msw_tglbtn.obj vc_mswud\core\msw_tglbtn.obj + vc_x64_mswud\core\msw_tglbtn.obj vc_mswu\core\msw_tglbtn.obj + vc_x64_mswu\core\msw_tglbtn.obj vc_mswuddll\core\msw_toolbar.obj + vc_x64_mswuddll\core\msw_toolbar.obj vc_mswudll\core\msw_toolbar.obj + vc_x64_mswudll\core\msw_toolbar.obj vc_mswud\core\msw_toolbar.obj + vc_x64_mswud\core\msw_toolbar.obj vc_mswu\core\msw_toolbar.obj + vc_x64_mswu\core\msw_toolbar.obj @@ -634,9 +968,13 @@ true + true true + true true + true true + true @@ -646,39 +984,59 @@ 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 true + true true + true true + true true + true @@ -687,17 +1045,25 @@ true + true true + true true + true true + true true + true true + true true + true true + true @@ -715,9 +1081,13 @@ vc_mswuddll\core\generic_statusbr.obj + vc_x64_mswuddll\core\generic_statusbr.obj vc_mswudll\core\generic_statusbr.obj + vc_x64_mswudll\core\generic_statusbr.obj vc_mswud\core\generic_statusbr.obj + vc_x64_mswud\core\generic_statusbr.obj vc_mswu\core\generic_statusbr.obj + vc_x64_mswu\core\generic_statusbr.obj @@ -731,23 +1101,37 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) @@ -802,21 +1186,37 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_gl.vcxproj b/build/msw/wx_vc10_gl.vcxproj index 37e4214668..b8edeac349 100644 --- a/build/msw/wx_vc10_gl.vcxproj +++ b/build/msw/wx_vc10_gl.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + gl @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\gl\ + vc_x64_mswud\gl\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\gl\ + vc_x64_mswu\gl\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\gl\ + vc_x64_mswuddll\gl\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\gl\ + vc_x64_mswudll\gl\ false + false true + true wxmsw30ud_gl + wxmsw30ud_gl wxmsw30u_gl + wxmsw30u_gl wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_gllib.pch - vc_mswud\gl\ + $(OutDir)wxmsw30ud_gl.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_gl.lib + true + + + $(OutDir)wx_vc9_gl.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_gllib.pch $(OutDir)wxmsw30ud_gl.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_gllib.pch - vc_mswu\gl\ + $(OutDir)wxmsw30u_gl.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_gl.lib + true + + + $(OutDir)wx_vc9_gl.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_gllib.pch $(OutDir)wxmsw30u_gl.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_gldll.pch - vc_mswuddll\gl\ $(OutDir)wxmsw30ud_gl_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_gldll.pch + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll + $(OutDir)wxmsw30ud_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_gldll.pch - vc_mswudll\gl\ $(OutDir)wxmsw30u_gl_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_gldll.pch + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_gl_vc_x64_custom.dll + $(OutDir)wxmsw30u_gl.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_gl.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -255,41 +477,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -297,4 +549,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_html.vcxproj b/build/msw/wx_vc10_html.vcxproj index 17a0ab5158..4b0debdf7a 100644 --- a/build/msw/wx_vc10_html.vcxproj +++ b/build/msw/wx_vc10_html.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + html @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\html\ + vc_x64_mswud\html\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\html\ + vc_x64_mswu\html\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\html\ + vc_x64_mswuddll\html\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\html\ + vc_x64_mswudll\html\ false + false true + true wxmsw30ud_html + wxmsw30ud_html wxmsw30u_html + wxmsw30u_html wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_htmllib.pch - vc_mswud\html\ + $(OutDir)wxmsw30ud_html.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_html.lib + true + + + $(OutDir)wx_vc9_html.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_htmllib.pch $(OutDir)wxmsw30ud_html.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_htmllib.pch - vc_mswu\html\ + $(OutDir)wxmsw30u_html.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_html.lib + true + + + $(OutDir)wx_vc9_html.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_htmllib.pch $(OutDir)wxmsw30u_html.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_htmldll.pch - vc_mswuddll\html\ $(OutDir)wxmsw30ud_html_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_htmldll.pch + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_html_vc_x64_custom.dll + $(OutDir)wxmsw30ud_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_htmldll.pch - vc_mswudll\html\ $(OutDir)wxmsw30u_html_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_htmldll.pch + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_html_vc_x64_custom.dll + $(OutDir)wxmsw30u_html.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_html_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_html.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -279,41 +501,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -338,4 +590,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_media.vcxproj b/build/msw/wx_vc10_media.vcxproj index a90472a829..31052935b7 100644 --- a/build/msw/wx_vc10_media.vcxproj +++ b/build/msw/wx_vc10_media.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + media @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\media\ + vc_x64_mswud\media\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\media\ + vc_x64_mswu\media\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\media\ + vc_x64_mswuddll\media\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\media\ + vc_x64_mswudll\media\ false + false true + true wxmsw30ud_media + wxmsw30ud_media wxmsw30u_media + wxmsw30u_media wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_medialib.pch - vc_mswud\media\ + $(OutDir)wxmsw30ud_media.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_media.lib + true + + + $(OutDir)wx_vc9_media.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_medialib.pch $(OutDir)wxmsw30ud_media.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_medialib.pch - vc_mswu\media\ + $(OutDir)wxmsw30u_media.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_media.lib + true + + + $(OutDir)wx_vc9_media.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_medialib.pch $(OutDir)wxmsw30u_media.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_mediadll.pch - vc_mswuddll\media\ $(OutDir)wxmsw30ud_media_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_mediadll.pch + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_media_vc_x64_custom.dll + $(OutDir)wxmsw30ud_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_mediadll.pch - vc_mswudll\media\ $(OutDir)wxmsw30u_media_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_mediadll.pch + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_media_vc_x64_custom.dll + $(OutDir)wxmsw30u_media.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_media_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_media.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -257,45 +479,75 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_net.vcxproj b/build/msw/wx_vc10_net.vcxproj index 1559865967..fc1855d07b 100644 --- a/build/msw/wx_vc10_net.vcxproj +++ b/build/msw/wx_vc10_net.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + net @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\net\ + vc_x64_mswud\net\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\net\ + vc_x64_mswu\net\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\net\ + vc_x64_mswuddll\net\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\net\ + vc_x64_mswudll\net\ false + false true + true wxbase30ud_net + wxbase30ud_net wxbase30u_net + wxbase30u_net wxbase30ud_$(ProjectName)_vc_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_netlib.pch - vc_mswud\net\ + $(OutDir)wxbase30ud_net.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_net.lib + true + + + $(OutDir)wx_vc9_net.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_netlib.pch $(OutDir)wxbase30ud_net.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_netlib.pch - vc_mswu\net\ + $(OutDir)wxbase30u_net.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_net.lib + true + + + $(OutDir)wx_vc9_net.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_netlib.pch $(OutDir)wxbase30u_net.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_netdll.pch - vc_mswuddll\net\ $(OutDir)wxbase30ud_net_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_netdll.pch + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_net_vc_x64_custom.dll + $(OutDir)wxbase30ud_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_net_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_netdll.pch - vc_mswudll\net\ $(OutDir)wxbase30u_net_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_netdll.pch + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_net_vc_x64_custom.dll + $(OutDir)wxbase30u_net.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_net_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_net.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -265,41 +487,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -316,4 +568,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_propgrid.vcxproj b/build/msw/wx_vc10_propgrid.vcxproj index fd89101d86..0a3e476389 100644 --- a/build/msw/wx_vc10_propgrid.vcxproj +++ b/build/msw/wx_vc10_propgrid.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + propgrid @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\propgrid\ + vc_x64_mswud\propgrid\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\propgrid\ + vc_x64_mswu\propgrid\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\propgrid\ + vc_x64_mswuddll\propgrid\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\propgrid\ + vc_x64_mswudll\propgrid\ false + false true + true wxmsw30ud_propgrid + wxmsw30ud_propgrid wxmsw30u_propgrid + wxmsw30u_propgrid wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_propgridlib.pch - vc_mswud\propgrid\ + $(OutDir)wxmsw30ud_propgrid.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_propgrid.lib + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_propgridlib.pch $(OutDir)wxmsw30ud_propgrid.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_propgridlib.pch - vc_mswu\propgrid\ + $(OutDir)wxmsw30u_propgrid.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_propgrid.lib + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_propgridlib.pch $(OutDir)wxmsw30u_propgrid.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_propgriddll.pch - vc_mswuddll\propgrid\ $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_propgriddll.pch + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30ud_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_propgriddll.pch - vc_mswudll\propgrid\ $(OutDir)wxmsw30u_propgrid_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_propgriddll.pch + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll + $(OutDir)wxmsw30u_propgrid.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_propgrid.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -261,41 +483,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -310,4 +562,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_qa.vcxproj b/build/msw/wx_vc10_qa.vcxproj index 13e2fd6178..503faefddb 100644 --- a/build/msw/wx_vc10_qa.vcxproj +++ b/build/msw/wx_vc10_qa.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + qa @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\qa\ + vc_x64_mswud\qa\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\qa\ + vc_x64_mswu\qa\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\qa\ + vc_x64_mswuddll\qa\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\qa\ + vc_x64_mswudll\qa\ false + false true + true wxmsw30ud_qa + wxmsw30ud_qa wxmsw30u_qa + wxmsw30u_qa wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_qalib.pch - vc_mswud\qa\ + $(OutDir)wxmsw30ud_qa.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_qa.lib + true + + + $(OutDir)wx_vc9_qa.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_qalib.pch $(OutDir)wxmsw30ud_qa.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_qalib.pch - vc_mswu\qa\ + $(OutDir)wxmsw30u_qa.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_qa.lib + true + + + $(OutDir)wx_vc9_qa.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_qalib.pch $(OutDir)wxmsw30u_qa.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_qadll.pch - vc_mswuddll\qa\ $(OutDir)wxmsw30ud_qa_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_qadll.pch + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll + $(OutDir)wxmsw30ud_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_qadll.pch - vc_mswudll\qa\ $(OutDir)wxmsw30u_qa_vc_custom.pdb Level4 true @@ -242,58 +417,135 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_qadll.pch + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_qa_vc_x64_custom.dll + $(OutDir)wxmsw30u_qa.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_qa.bsc + true + + Create + Create Create + Create Create + Create Create + Create true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) - \ No newline at end of file + diff --git a/build/msw/wx_vc10_ribbon.vcxproj b/build/msw/wx_vc10_ribbon.vcxproj index 6ebc8825c1..3a389889a4 100644 --- a/build/msw/wx_vc10_ribbon.vcxproj +++ b/build/msw/wx_vc10_ribbon.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + ribbon @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\ribbon\ + vc_x64_mswud\ribbon\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\ribbon\ + vc_x64_mswu\ribbon\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\ribbon\ + vc_x64_mswuddll\ribbon\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\ribbon\ + vc_x64_mswudll\ribbon\ false + false true + true wxmsw30ud_ribbon + wxmsw30ud_ribbon wxmsw30u_ribbon + wxmsw30u_ribbon wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_ribbonlib.pch - vc_mswud\ribbon\ + $(OutDir)wxmsw30ud_ribbon.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_ribbon.lib + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_ribbonlib.pch $(OutDir)wxmsw30ud_ribbon.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_ribbonlib.pch - vc_mswu\ribbon\ + $(OutDir)wxmsw30u_ribbon.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_ribbon.lib + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_ribbonlib.pch $(OutDir)wxmsw30u_ribbon.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_ribbondll.pch - vc_mswuddll\ribbon\ $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_ribbondll.pch + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30ud_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_ribbondll.pch - vc_mswudll\ribbon\ $(OutDir)wxmsw30u_ribbon_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_ribbondll.pch + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll + $(OutDir)wxmsw30u_ribbon.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_ribbon.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -263,41 +485,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -312,4 +564,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_richtext.vcxproj b/build/msw/wx_vc10_richtext.vcxproj index 00a73de0ac..23576c854c 100644 --- a/build/msw/wx_vc10_richtext.vcxproj +++ b/build/msw/wx_vc10_richtext.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + richtext @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\richtext\ + vc_x64_mswud\richtext\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\richtext\ + vc_x64_mswu\richtext\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\richtext\ + vc_x64_mswuddll\richtext\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\richtext\ + vc_x64_mswudll\richtext\ false + false true + true wxmsw30ud_richtext + wxmsw30ud_richtext wxmsw30u_richtext + wxmsw30u_richtext wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_richtextlib.pch - vc_mswud\richtext\ + $(OutDir)wxmsw30ud_richtext.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_richtext.lib + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_richtextlib.pch $(OutDir)wxmsw30ud_richtext.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_richtextlib.pch - vc_mswu\richtext\ + $(OutDir)wxmsw30u_richtext.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_richtext.lib + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_richtextlib.pch $(OutDir)wxmsw30u_richtext.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_richtextdll.pch - vc_mswuddll\richtext\ $(OutDir)wxmsw30ud_richtext_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_richtextdll.pch + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30ud_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_richtextdll.pch - vc_mswudll\richtext\ $(OutDir)wxmsw30u_richtext_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_richtextdll.pch + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll + $(OutDir)wxmsw30u_richtext.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_richtext.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -263,41 +485,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -324,4 +576,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_vc10_stc.vcxproj b/build/msw/wx_vc10_stc.vcxproj index 4888343dd9..f66a7a570c 100644 --- a/build/msw/wx_vc10_stc.vcxproj +++ b/build/msw/wx_vc10_stc.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + stc @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\stc\ + vc_x64_mswud\stc\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\stc\ + vc_x64_mswu\stc\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\stc\ + vc_x64_mswuddll\stc\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\stc\ + vc_x64_mswudll\stc\ false + false true + true wxmsw30ud_stc + wxmsw30ud_stc wxmsw30u_stc + wxmsw30u_stc wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_stclib.pch - vc_mswud\stc\ + $(OutDir)wxmsw30ud_stc.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_stc.lib + true + + + $(OutDir)wx_vc9_stc.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_stclib.pch $(OutDir)wxmsw30ud_stc.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_stclib.pch - vc_mswu\stc\ + $(OutDir)wxmsw30u_stc.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_stc.lib + true + + + $(OutDir)wx_vc9_stc.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_stclib.pch $(OutDir)wxmsw30u_stc.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_stcdll.pch - vc_mswuddll\stc\ $(OutDir)wxmsw30ud_stc_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + 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) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_stcdll.pch + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_stcdll.pch - vc_mswudll\stc\ $(OutDir)wxmsw30u_stc_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_stcdll.pch + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_stc_vc_x64_custom.dll + $(OutDir)wxmsw30u_stc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_stc.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -256,41 +478,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_webview.vcxproj b/build/msw/wx_vc10_webview.vcxproj index 37bd28da75..bb599911ba 100644 --- a/build/msw/wx_vc10_webview.vcxproj +++ b/build/msw/wx_vc10_webview.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + webview @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\webview\ + vc_x64_mswud\webview\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\webview\ + vc_x64_mswu\webview\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\webview\ + vc_x64_mswuddll\webview\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\webview\ + vc_x64_mswudll\webview\ false + false true + true wxmsw30ud_webview + wxmsw30ud_webview wxmsw30u_webview + wxmsw30u_webview wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_webviewlib.pch - vc_mswud\webview\ + $(OutDir)wxmsw30ud_webview.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_webview.lib + true + + + $(OutDir)wx_vc9_webview.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_webviewlib.pch $(OutDir)wxmsw30ud_webview.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_webviewlib.pch - vc_mswu\webview\ + $(OutDir)wxmsw30u_webview.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_webview.lib + true + + + $(OutDir)wx_vc9_webview.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_webviewlib.pch $(OutDir)wxmsw30u_webview.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_webviewdll.pch - vc_mswuddll\webview\ $(OutDir)wxmsw30ud_webview_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_webviewdll.pch + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_webview_vc_custom.dll + $(OutDir)wxmsw30ud_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_webview_vc_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_webviewdll.pch - vc_mswudll\webview\ $(OutDir)wxmsw30u_webview_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_webviewdll.pch + $(OutDir)wxmsw30u_webview_vc_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_webview_vc_custom.dll + $(OutDir)wxmsw30u_webview.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_webview_vc_custom.pdb + true + true + + + $(OutDir)wx_vc9_webview.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -257,41 +479,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) @@ -302,4 +554,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxexpat.vcxproj b/build/msw/wx_vc10_wxexpat.vcxproj index a36edff0de..f4ca04a3fc 100644 --- a/build/msw/wx_vc10_wxexpat.vcxproj +++ b/build/msw/wx_vc10_wxexpat.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxexpat @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxexpat\ + vc_x64_mswud\wxexpat\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxexpat\ + vc_x64_mswu\wxexpat\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxexpat\ + vc_x64_mswuddll\wxexpat\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxexpat\ + vc_x64_mswudll\wxexpat\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxexpat\ + $(OutDir)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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(OutDir)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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir);%(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 $(OutDir)wxexpatd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxexpat\ + $(OutDir)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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(OutDir)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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir);%(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 $(OutDir)wxexpat.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxexpat\ + $(OutDir)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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpatd.lib + true + + + $(OutDir)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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir);%(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 $(OutDir)wxexpatd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxexpat\ + $(OutDir)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 + $(OutDir);%(AdditionalIncludeDirectories) + + + $(OutDir)wxexpat.lib + true + + + $(OutDir)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) + $(OutDir);%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir);%(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 $(OutDir)wxexpat.pdb Level3 true diff --git a/build/msw/wx_vc10_wxjpeg.vcxproj b/build/msw/wx_vc10_wxjpeg.vcxproj index 875449520a..e14ca341ca 100644 --- a/build/msw/wx_vc10_wxjpeg.vcxproj +++ b/build/msw/wx_vc10_wxjpeg.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxjpeg @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxjpeg\ + vc_x64_mswud\wxjpeg\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxjpeg\ + vc_x64_mswu\wxjpeg\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxjpeg\ + vc_x64_mswuddll\wxjpeg\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxjpeg\ + vc_x64_mswudll\wxjpeg\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxjpeg\ + $(OutDir)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 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(OutDir)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) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;%(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 $(OutDir)wxjpegd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxjpeg\ + $(OutDir)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 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(OutDir)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) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;%(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 $(OutDir)wxjpeg.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxjpeg\ + $(OutDir)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 + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpegd.lib + true + + + $(OutDir)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) + $(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;%(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 $(OutDir)wxjpegd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxjpeg\ + $(OutDir)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 + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxjpeg.lib + true + + + $(OutDir)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) + $(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;%(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 $(OutDir)wxjpeg.pdb Level3 true diff --git a/build/msw/wx_vc10_wxpng.vcxproj b/build/msw/wx_vc10_wxpng.vcxproj index 17a1f09c40..2ae5de47f5 100644 --- a/build/msw/wx_vc10_wxpng.vcxproj +++ b/build/msw/wx_vc10_wxpng.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxpng @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxpng\ + vc_x64_mswud\wxpng\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxpng\ + vc_x64_mswu\wxpng\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxpng\ + vc_x64_mswuddll\wxpng\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxpng\ + vc_x64_mswudll\wxpng\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxpng\ + $(OutDir)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) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)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) + ..\..\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 $(OutDir)wxpngd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxpng\ + $(OutDir)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) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)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 $(OutDir)wxpng.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxpng\ + $(OutDir)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) + + + $(OutDir)wxpngd.lib + true + + + $(OutDir)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) + ..\..\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 $(OutDir)wxpngd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxpng\ + $(OutDir)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) + + + $(OutDir)wxpng.lib + true + + + $(OutDir)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 $(OutDir)wxpng.pdb Level3 true diff --git a/build/msw/wx_vc10_wxregex.vcxproj b/build/msw/wx_vc10_wxregex.vcxproj index 5909a6b3fa..55e47788d2 100644 --- a/build/msw/wx_vc10_wxregex.vcxproj +++ b/build/msw/wx_vc10_wxregex.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxregex @@ -28,51 +44,95 @@ false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxregex\ + vc_x64_mswud\wxregex\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxregex\ + vc_x64_mswu\wxregex\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxregex\ + vc_x64_mswuddll\wxregex\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxregex\ + vc_x64_mswudll\wxregex\ $(ProjectName)ud + $(ProjectName)ud $(ProjectName)ud + $(ProjectName)ud $(ProjectName)u + $(ProjectName)u $(ProjectName)u + $(ProjectName)u @@ -89,7 +149,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxregex\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(OutDir)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) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\include;$(OutDir)mswud;%(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__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -122,7 +215,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxregex\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxregexu.pdb Level3 true @@ -157,7 +281,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxregex\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexud.lib + true + + + $(OutDir)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) + ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\include;$(OutDir)mswud;%(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__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxregexud.pdb Level3 true @@ -190,7 +347,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxregex\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + $(OutDir)wxregexu.lib + true + + + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxregexu.pdb Level3 true @@ -219,38 +407,66 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxscintilla.vcxproj b/build/msw/wx_vc10_wxscintilla.vcxproj index d84e2c22e1..3e6dac77a6 100644 --- a/build/msw/wx_vc10_wxscintilla.vcxproj +++ b/build/msw/wx_vc10_wxscintilla.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxscintilla @@ -28,49 +44,91 @@ false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxscintilla\ + vc_x64_mswud\wxscintilla\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxscintilla\ + vc_x64_mswu\wxscintilla\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxscintilla\ + vc_x64_mswuddll\wxscintilla\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxscintilla\ + vc_x64_mswudll\wxscintilla\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -87,7 +145,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxscintilla\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(OutDir)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;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\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__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -120,7 +211,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxscintilla\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\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__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxscintilla.pdb Level3 true @@ -155,7 +277,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxscintilla\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintillad.lib + true + + + $(OutDir)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) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\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__;_UNICODE;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true $(OutDir)wxscintillad.pdb Level3 true @@ -188,7 +343,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxscintilla\ + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + 0x0409 + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + $(OutDir)wxscintilla.lib + true + + + $(OutDir)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__;_UNICODE;%(PreprocessorDefinitions) + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\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__;_UNICODE;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true $(OutDir)wxscintilla.pdb Level3 true @@ -332,38 +518,66 @@ Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) - + \ No newline at end of file diff --git a/build/msw/wx_vc10_wxtiff.vcxproj b/build/msw/wx_vc10_wxtiff.vcxproj index 888fbd5f5e..4e06eb171c 100644 --- a/build/msw/wx_vc10_wxtiff.vcxproj +++ b/build/msw/wx_vc10_wxtiff.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxtiff @@ -27,46 +43,84 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxtiff\ + vc_x64_mswud\wxtiff\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxtiff\ + vc_x64_mswu\wxtiff\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxtiff\ + vc_x64_mswuddll\wxtiff\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxtiff\ + vc_x64_mswudll\wxtiff\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d @@ -83,7 +137,40 @@ MultiThreadedDebugDLL true true - vc_mswud\wxtiff\ + $(OutDir)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) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)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) + ..\..\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 $(OutDir)wxtiffd.pdb Level3 true @@ -116,7 +203,38 @@ Sync MultiThreadedDLL true - vc_mswu\wxtiff\ + $(OutDir)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) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)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 $(OutDir)wxtiff.pdb Level3 true @@ -151,7 +269,40 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxtiff\ + $(OutDir)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) + + + $(OutDir)wxtiffd.lib + true + + + $(OutDir)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) + ..\..\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 $(OutDir)wxtiffd.pdb Level3 true @@ -184,7 +335,38 @@ Sync MultiThreadedDLL true - vc_mswudll\wxtiff\ + $(OutDir)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) + + + $(OutDir)wxtiff.lib + true + + + $(OutDir)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 $(OutDir)wxtiff.pdb Level3 true diff --git a/build/msw/wx_vc10_wxzlib.vcxproj b/build/msw/wx_vc10_wxzlib.vcxproj index a9f3a53308..c21e20eb2d 100644 --- a/build/msw/wx_vc10_wxzlib.vcxproj +++ b/build/msw/wx_vc10_wxzlib.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + wxzlib @@ -27,49 +43,121 @@ StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + StaticLibrary false + + StaticLibrary + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\wxzlib\ + vc_x64_mswud\wxzlib\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\wxzlib\ + vc_x64_mswu\wxzlib\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\wxzlib\ + vc_x64_mswuddll\wxzlib\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\wxzlib\ + vc_x64_mswudll\wxzlib\ $(ProjectName)d + $(ProjectName)d $(ProjectName)d + $(ProjectName)d + 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) + %(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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -83,7 +171,6 @@ MultiThreadedDebugDLL true true - vc_mswud\wxzlib\ $(OutDir)wxzlibd.pdb Level3 true @@ -105,6 +192,38 @@ + 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) + %(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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -116,7 +235,6 @@ Sync MultiThreadedDLL true - vc_mswu\wxzlib\ $(OutDir)wxzlib.pdb Level3 true @@ -138,6 +256,40 @@ + 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) + %(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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlibd.lib + true + + + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -151,7 +303,6 @@ MultiThreadedDebugDLL true true - vc_mswuddll\wxzlib\ $(OutDir)wxzlibd.pdb Level3 true @@ -173,6 +324,38 @@ + 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) + %(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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + $(OutDir)wxzlib.lib + true + + + $(OutDir)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;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) %(AdditionalIncludeDirectories) @@ -184,7 +367,6 @@ Sync MultiThreadedDLL true - vc_mswudll\wxzlib\ $(OutDir)wxzlib.pdb Level3 true @@ -224,4 +406,4 @@ - + \ No newline at end of file diff --git a/build/msw/wx_vc10_xml.vcxproj b/build/msw/wx_vc10_xml.vcxproj index ae2af8dab8..5b474e0834 100644 --- a/build/msw/wx_vc10_xml.vcxproj +++ b/build/msw/wx_vc10_xml.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + xml @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xml\ + vc_x64_mswud\xml\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xml\ + vc_x64_mswu\xml\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xml\ + vc_x64_mswuddll\xml\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xml\ + vc_x64_mswudll\xml\ false + false true + true wxbase30ud_xml + wxbase30ud_xml wxbase30u_xml + wxbase30u_xml wxbase30ud_$(ProjectName)_vc_custom + wxbase30ud_$(ProjectName)_vc_x64_custom wxbase30u_$(ProjectName)_vc_custom + wxbase30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xmllib.pch - vc_mswud\xml\ + $(OutDir)wxbase30ud_xml.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30ud_xml.lib + true + + + $(OutDir)wx_vc9_xml.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xmllib.pch $(OutDir)wxbase30ud_xml.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xmllib.pch - vc_mswu\xml\ + $(OutDir)wxbase30u_xml.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxbase30u_xml.lib + true + + + $(OutDir)wx_vc9_xml.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_xmllib.pch $(OutDir)wxbase30u_xml.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xmldll.pch - vc_mswuddll\xml\ $(OutDir)wxbase30ud_xml_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xmldll.pch + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxbase30ud_xml_vc_x64_custom.dll + $(OutDir)wxbase30ud_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_xmldll.pch - vc_mswudll\xml\ $(OutDir)wxbase30u_xml_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xmldll.pch + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxbase30u_xml_vc_x64_custom.dll + $(OutDir)wxbase30u_xml.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxbase30u_xml_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xml.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -255,41 +477,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) diff --git a/build/msw/wx_vc10_xrc.vcxproj b/build/msw/wx_vc10_xrc.vcxproj index 6cf6aa8be6..5124806f6b 100644 --- a/build/msw/wx_vc10_xrc.vcxproj +++ b/build/msw/wx_vc10_xrc.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug + x64 + DLL Debug Win32 + + DLL Debug + x64 + DLL Release Win32 + + DLL Release + x64 + Release Win32 + + Release + x64 + xrc @@ -28,55 +44,103 @@ false Unicode + + DynamicLibrary + false + Unicode + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + StaticLibrary false Unicode + + StaticLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswud\xrc\ + vc_x64_mswud\xrc\ ..\..\lib\vc_lib\ + ..\..\lib\vc_x64_lib\ vc_mswu\xrc\ + vc_x64_mswu\xrc\ ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswuddll\xrc\ + vc_x64_mswuddll\xrc\ true + true true + true ..\..\lib\vc_dll\ + ..\..\lib\vc_x64_dll\ vc_mswudll\xrc\ + vc_x64_mswudll\xrc\ false + false true + true wxmsw30ud_xrc + wxmsw30ud_xrc wxmsw30u_xrc + wxmsw30u_xrc wxmsw30ud_$(ProjectName)_vc_custom + wxmsw30ud_$(ProjectName)_vc_x64_custom wxmsw30u_$(ProjectName)_vc_custom + wxmsw30u_$(ProjectName)_vc_x64_custom @@ -96,7 +160,43 @@ Use wx/wxprec.h vc_mswud\wxprec_xrclib.pch - vc_mswud\xrc\ + $(OutDir)wxmsw30ud_xrc.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30ud_xrc.lib + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + + + + WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswud\wxprec_xrclib.pch $(OutDir)wxmsw30ud_xrc.pdb Level4 true @@ -132,7 +232,41 @@ Use wx/wxprec.h vc_mswu\wxprec_xrclib.pch - vc_mswu\xrc\ + $(OutDir)wxmsw30u_xrc.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + $(OutDir)wxmsw30u_xrc.lib + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + + + + WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswu\wxprec_xrclib.pch $(OutDir)wxmsw30u_xrc.pdb Level4 true @@ -170,7 +304,6 @@ Use wx/wxprec.h vc_mswuddll\wxprec_xrcdll.pch - vc_mswuddll\xrc\ $(OutDir)wxmsw30ud_xrc_vc_custom.pdb Level4 true @@ -197,6 +330,49 @@ 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) + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + Disabled + $(OutDir)mswud;..\..\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebugDLL + true + true + Use + wx/wxprec.h + vc_mswuddll\wxprec_xrcdll.pch + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30ud_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb + + + $(OutDir)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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) @@ -213,7 +389,6 @@ Use wx/wxprec.h vc_mswudll\wxprec_xrcdll.pch - vc_mswudll\xrc\ $(OutDir)wxmsw30u_xrc_vc_custom.pdb Level4 true @@ -242,12 +417,59 @@ true + + + WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + /MP %(AdditionalOptions) + MaxSpeed + $(OutDir)mswu;..\..\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__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + Sync + MultiThreadedDLL + true + Use + wx/wxprec.h + vc_mswudll\wxprec_xrcdll.pch + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + Level4 + true + ProgramDatabase + + + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) + 0x0409 + $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) + + + %(AdditionalOptions) + wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) + $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll + $(OutDir)wxmsw30u_xrc.lib + true + $(OutDir);%(AdditionalLibraryDirectories) + true + $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb + true + true + + + $(OutDir)wx_vc9_xrc.bsc + true + + Create + Create Create + Create Create + Create Create + Create @@ -318,41 +540,71 @@ true + true true + true Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\setup.h + Creating $(OutDir)mswud\wx\setup.h copy "%(FullPath)" $(OutDir)mswud\wx\setup.h + copy "%(FullPath)" $(OutDir)mswud\wx\setup.h $(OutDir)mswud\wx\setup.h;%(Outputs) + $(OutDir)mswud\wx\setup.h;%(Outputs) Creating $(OutDir)mswu\wx\setup.h + Creating $(OutDir)mswu\wx\setup.h copy "%(FullPath)" $(OutDir)mswu\wx\setup.h + copy "%(FullPath)" $(OutDir)mswu\wx\setup.h $(OutDir)mswu\wx\setup.h;%(Outputs) + $(OutDir)mswu\wx\setup.h;%(Outputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswud\wx\msw\rcdefs.h + Creating $(OutDir)mswud\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswud\wx\msw;%(AdditionalInputs) + $(OutDir)mswud\wx\msw;%(AdditionalInputs) Creating $(OutDir)mswu\wx\msw\rcdefs.h + Creating $(OutDir)mswu\wx\msw\rcdefs.h cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" + cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) + $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) $(OutDir)mswu\wx\msw;%(AdditionalInputs) + $(OutDir)mswu\wx\msw;%(AdditionalInputs) From d06a91910eb568dc9530c3fb32030051ac184c2f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Oct 2013 15:33:39 +0000 Subject: [PATCH 3/6] Simplify and update wxMSW build instructions. Keep the most important points, remove the obsolete stuff. Also get rid of 99% of the contents of BuildSVN.txt which simply duplicated the information from the other files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- BuildSVN.txt | 247 +--------------- docs/msw/install.txt | 684 ++++++++++++++----------------------------- 2 files changed, 221 insertions(+), 710 deletions(-) diff --git a/BuildSVN.txt b/BuildSVN.txt index 06d5fd8b73..95d614921a 100644 --- a/BuildSVN.txt +++ b/BuildSVN.txt @@ -2,243 +2,12 @@ How to build the sources from SVN ------------------------------------------------------------------------ -Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac -etc. alongside these instructions. - -I) Windows using plain makefiles ----------------------------------------- - -a) If using Microsoft Visual C++ 5.0 or 6.0 - -Ensure that the command-line compiler and tools (including -nmake) are installed and ready to run. Depending on your -installation there may be a batch file (commonly named VCVARS32.BAT) -that needs to be run to set correct environment variables and PATH entries. - -Continue with item c) below. - - -b) If using the MinGW or Cygwin compilers - -You can get MinGW from http://www.mingw.org/ - -Cygwin is available at http://www.cygwin.com/ - -If you are using Cygwin or MinGW together with the MSYS environment, you -can build the library using configure (see "Unix ports" and -"Windows using configure" below). You can also -build wxWidgets without configure using native makefile, but only with -MinGW. Using Cygwin together with Windows makefile is no longer supported. - -If building with MinGW without configure: - --> Set your path so that it includes the directory - where your compiler and tools reside - --> Make sure you have GNU Make installed. It must be Windows native version. - Download it from http://www.mingw.org, the executable will be called - mingw32-make.exe. - --> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3), - but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will - have to change variable GCC_VERSION in config.gcc (see msw/install.txt - for details). - -If using configure, Unix instructions apply. - - -c) Build instructions - -Assuming that you installed the wxWidgets sources into c:\wxWidgets: - --> Copy c:\wxWidgets\include\wx\msw\setup0.h - to c:\wxWidgets\include\wx\msw\setup.h --> Edit c:\wxWidgets\include\wx\msw\setup.h to choose - the features you would like to compile wxWidgets with[out]. - - and std iostreams are disabled with - #define wxUSE_STD_IOSTREAM 0 - --> type: cd c:\wxWidgets\build\msw --> type: make -f makefile.gcc (if using GNU tools) -or type: nmake -f makefile.vc (if using MS VC++) -etc. - - See also docs/msw/install.txt for additional compilation options. - -d) Borland (including free command line tools) - Download tools from http://www.borland.com/downloads/ - - See docs/msw/install.txt for details; in brief: - --> type cd c:\wxWidgets\build\msw --> type make -f makefile.bcc - -You can customize many things in the build process, detailed description is -in docs/msw/install.txt. - - -II) Unix ports --------------- - -Building wxGTK or wxMotif completely without configure -won't ever work, but there is now a new makefile system -that works without libtool and automake, using only -configure to create what is needed. - -In order to create configure, you need to have the -GNU autoconf package (version > 2.54) installed -on your system and type run "autoconf" in the base -directory (or run the autogen.sh script in the same -directory, which just calls autoconf). Note that you usually don't -need to do this because configure is included in SVN. - -Set WXWIN environment variable to the base directory such -as ~/wxWidgets (this is actually not really needed). - --> type: export WXWIN=~/wxWidgets --> type: md mybuild --> type: cd mybuild --> type: ../configure --with-motif -or type: ../configure --with-gtk --> type: make --> type: su --> type: make install --> type: ldconfig --> type: exit - -Call configure with --disable-shared to create a static -library. Calling "make uninstall" will remove the installed -library and "make dist" will create a distribution (not -yet complete). - -III) Windows using configure ----------------------------------------- - -wxWidgets can be built on Windows using MSYS (see -http://www.mingw.org/), which is a POSIX build environment -for Windows. With MSYS you can just ./configure && make (see also VII, -Unix->Windows cross-compiling using configure). - -Of course, you can also build the library using plain makefiles (see -section I). - -V) MacOS X using configure and the Developer Tools ----------------------------------------- - -You need to have the Developer Tools installed. If this is not the case, -you will need to register at the Apple Developer web site (this is a free -registration) in order to download the Developer Tools installer. - -In order to create configure, you need to have the -GNU autoconf package (version >= 2.54) installed -on your system and type run "autoconf" in the base -directory (or run the autogen.sh script in the same -directory, which just calls autoconf). - --> type: mkdir macbuild --> type: cd macbuild --> type: ../configure --with-mac -or type: ../configure --> type: make - -VI) OS/2 ----------------------------------------- -No notes. - -VII) Unix->Windows cross-compiling using configure --------------------------------------------------- - -First you'll need a cross-compiler; linux glibc binaries of MinGW and -Cygwin (both based on egcs) can be found at -ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries, -based on the latest MinGW release can be found at -http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html -Otherwise you can compile one yourself. - -[ A Note about Cygwin and MinGW: the main difference is that Cygwin -binaries are always linked against cygwin.dll. This dll encapsulates most -standard Unix C extensions, which is very handy if you're porting unix -software to windows. However, wxMSW doesn't need this, so MinGW is -preferable if you write portable C(++). ] - -You might want to build both Unix and Windows binaries in the same source -tree; to do this make subdirs for each e.g. unix and win32. If you've -already build wxWidgets in the main dir, do a 'make distclean' there, -otherwise configure will get confused. (In any case, read the section 'Unix -using configure' and make sure you're able to build a native wxWidgets -library; cross-compiling errors can be pretty obscure and you'll want to be -sure that your configure setup is basically sound.) - -To cross compile the windows library, do --> cd win32 -(or whatever you called it) -Now run configure. There are two ways to do this --> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw -where --build= should read whatever platform you're building on. Configure -will notice that build and host platforms differ, and automatically prepend -i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!). -The other way to run configure is by specifying the names of the binaries -yourself: --> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \ - DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \ - ../configure --host=i586-mingw32 --with-mingw - -(all assuming you're using MinGW) -By default this will compile a DLL, if you want a static library, -specify --disable-shared. - -Type --> make -and wait, wait, wait. Don't leave the room, because the minute you do there -will be a compile error :-) - -NB: if you are using a very old compiler you risk to get quite a few warnings - about "ANSI C++ forbids implicit conversion from 'void *'" in all places - where va_arg macro is used. This is due to a bug in (some versions of) - MinGW headers which may be corrected by upgrading your compier, - otherwise you might edit the file - - ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h - - (instead of egcs-2.91.57 you may have something different), searching for - the lines - -/* Define __gnuc_va_list. */ - -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) -typedef char *__gnuc_va_list; -#else -typedef void *__gnuc_va_list; -#endif -#endif - - and adding "|| defined(_WIN32)" to the list of platforms on which - __gnuc_va_list is char *. - -If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib -(or just libwx_msw.a if you opted for a static build). -Now try building the minimal sample: - --> cd samples/minimal --> make - -and run it with wine, for example (or copy to a Windows box) --> wine minimal.exe - -If all is well, do an install; from win32 --> make install - -Native and cross-compiled installations can co-exist peacefully -(as long as their widget sets differ), except for wx-config. You might -want to rename the cross-compiled one to i586-mingw32-wx-config, or something. - -Cross-compiling TODO: ---------------------- -- resource compiling must be done manually for now (should/can we link the -default wx resources into libwx_msw.a?) [ No we can't; the linker won't -link it in... you have to supply an object file ] -- static executables are HUGE -- there must be room for improvement. +Before building from svn sources under Windows, you need to copy the +file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is +necessary in order to allow having local modifications to the latter +file without showing it as modified, as it is not under version +control. +After doing this, please proceed with the build as with any official +release, i.e. follow the instructions in the install.txt file in +docs/gtk, docs/msw and so on. diff --git a/docs/msw/install.txt b/docs/msw/install.txt index b216291e25..6d24e72035 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,27 +1,9 @@ -Installing wxWidgets for Windows ------------------------------------------------------------ + Installing wxWidgets for Windows + -------------------------------- This is wxWidgets for Microsoft Windows 9x/ME, Windows NT -and later (2000, XP, Vista, 7, etc) and Windows CE. - -These installation notes can be found in docs/msw/install.txt -in your wxWidgets distribution. - -IMPORTANT NOTE: If you experience problems installing, please -re-read these instructions and other related files (changes.txt, -readme.txt, FAQ) carefully before posting to wx-users list. - -If you are sure that you found a bug, please report it at -wxWidgets Trac: - - http://trac.wxwidgets.org/newticket - -Please notice that often trying to correct the bug yourself is the -quickest way to fix it. Even if you fail to do it, you may -discover valuable information allowing us to fix it while doing -it. We also give much higher priority to bug reports with patches -fixing the problems so this ensures that your report will be -addressed sooner. +and later (2000, XP, Vista, 7, 8, etc) including both 32 bit and 64 +bit versions. Table of Contents: @@ -34,27 +16,37 @@ Table of Contents: Installation ============ -Please simply uncompress the .zip file manually into any directory. -However we advise avoiding using directories with spaces in their -names (notably "C:\Program Files") as this risks creating problems +If you are using one of the supported compilers, you can download the +pre-built in binaries from + + https://sourceforge.net/projects/wxwindows/files/3.0.0/binaries/ + +or + + ftp://ftp.wxwidgets.org/pub/3.0.0/binaries/ + +In this case, just uncompress the binaries archive under any directory +and skip to "Building Applications Using wxWidgets" part. + +Otherwise, or if you want to build a configuration of the library +different from the default one, you need to build the library from +sources before using it. + +The first step, which you may have already performed, unless you are +reading this file online, is to download the source archive and +uncompress it in any directory. It is strongly advised to avoid using +spaces in the name of this directory, i.e. notably do *not* choose a +location under "C:\Program Files", as this risks creating problems with makefiles and other command-line tools. - -In the majority of cases, you don't need to change the default -library build configuration. If you wish to change some of the build -options you need to edit the include/wx/msw/setup.h file enabling or -disabling the features you would like to compile wxWidgets with[out]. +After choosing the directory location, please define WXWIN environment +variable containing the full path to this directory. While this is not +actually required, this makes using the library more convenient and +this environment variable is used in the examples below. NB: If you checked your sources from version control repository and - didn't obtain them from a release file, the file above doesn't - exist and you will need to copy include/wx/msw/setup0.h to - include/wx/msw/setup.h. - -Notice that this file is later copied into a directory under lib for -each of the build configurations which allows to have different -build options for different configurations too. - -See "Configuring the Build" section for more information. + didn't obtain them from a release file, you also need to copy + include/wx/msw/setup0.h to include/wx/msw/setup.h. Building wxWidgets @@ -64,224 +56,168 @@ The following sections explain how to compile wxWidgets with each supported compiler, see the "Building Applications" section about the instructions for building your application using wxWidgets. -Search for one of Microsoft/Borland/Watcom/Symantec/Cygwin/Mingw32 keywords -to quickly locate the instructions for your compiler. Notice that the primary -compilers for wxWidgets under MSW are Microsoft Visual C++ and GNU g++, other -compilers are more rarely tested and might not work so please consider using -one of these two if possible. - All makefiles and project are located in build\msw directory. -Where Compiled Files are Stored -------------------------------- - -After successful compilation you'll find the libraries in a subdirectory -of lib directory named after the compiler and DLL/static settings. -A couple of examples: - - lib\vc_lib VC++ compiled static libraries - lib\vc_dll VC++ DLLs - lib\bcc_lib Static libraries for Borland C++ - lib\wat_dll Watcom C++ DLLs - -Names of compiled wxWidgets libraries follow this scheme: libraries that don't -depend on GUI components begin with "wxbase" followed by a version number and, -optionally, letters indicating Unicode compilation ('u') and a debug build ('d'). -The last component is the name of the wxWidgets component (unless you build the -library as single monolithic library; look for "Configuring the Build" below). -This is a typical set of release ANSI build libraries (release versions on -left, debug on right side): - - wxbase29.lib wxbase29d.lib - wxbase29_net.lib wxbase29d_net.lib - wxbase29_xml.lib wxbase29d_xml.lib - wxmsw29_core.lib wxmsw29d_core.lib - wxmsw29_html.lib wxmsw29d_html.lib - wxmsw29_adv.lib wxmsw29d_adv.lib - -Their Unicode debug counterparts in wxUniversal build would be - - wxbase29ud.lib - wxbase29ud_net.lib - wxbase29ud_xml.lib (notice these libs are same for wxUniv and wxMSW) - wxmswuniv29ud_core.lib - wxmswuniv29ud_html.lib - wxmswuniv29ud_adv.lib - -These directories also contain a subdirectory with the wx/setup.h header. This -subdirectory is named after the port, Unicode, wxUniv and debug settings and -you must add it to the include paths when compiling your application. Some -examples: - - lib\vc_lib\msw\wx\setup.h VC++ static, wxMSW - lib\vc_lib\mswud\wx\setup.h VC++ static, wxMSW, Unicode, debug - lib\vc_lib\mswunivd\wx\setup.h VC++ static, wxUniversal, debug - -Below are compiler specific notes followed by customizing instructions that -apply to all compilers (search for "Configuring the Build"). - Microsoft Visual C++ Compilation ---------------------------------------------------------------- -You may wish to visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide -for a more informal and detailed description of the process summarized below. +* From command line using the provided makefiles: -Please note that currently ready to use projeect files are provided for VC++ -versions 6 through to 9 (also known as 6, 2003, 2005 and 2008). For VC++ 10 and -11 (2010 and 2012, respectively), you will need to import the existing VC9 -project files. +0. Open a "Visual Studio Command Prompt" window shortcut to which + must have been installed to the "Start" menu or the "Start" screen + by MSVS installation. -Using project files (VC++ 6 and later): +1. Change directory to %WXWIN%\build\msw and type -1. Unarchive wxWidgets-x.y.z-vc.zip, the VC++ 6 project - makefiles (already included in wxMSW-x.y.z.zip and the setup version). -2. Open build\msw\wx.dsw, which has configurations for static - compilation or DLL compilation, and each of these available in - Unicode/ANSI, Debug/Release and wxUniversal or native variations. - Choose the Win32 Debug or Win32 Release configuration (or any other that - suits your needs) and use Batch Build to compile _all_ projects. If you - know you won't need some of the libraries (e.g. the HTML part), you don't have - to compile it. It will also produce similar variations on jpeg.lib, - png.lib, tiff.lib, zlib.lib, and regex.lib. + > nmake /f makefile.vc - If you want to build DLL configurations in wx.dsw project you unfortunately - need to build them in the proper order (jpeg, png, tiff, zlib, regex, expat, - base, net, core, gl, html, media, qa, adv, xrc, aui, richtext, - propgrid) manually because VC6 doesn't always respect the correct build order. + to build wxWidgets in the default debug configuration as a static + library. You can also do - Alternatively, use the special wx_dll.dsw project which adds the - dependencies to force the correct order (but, because of this, doesn't work - for the static libraries) or simply redo the build several times until all - DLLs are linked correctly. -3. Open a sample project file, choose a configuration such as - Win32 Debug using Build | Set Active Configuration..., and compile. - The project files don't use precompiled headers, to save disk - space, but you can switch PCH compiling on for greater speed. - NOTE: you may also use samples/samples.dsw to access all - sample projects without opening each workspace individually. - You can use the Batch Build facility to make several samples - at a time. + > nmake /f makefile.vc BUILD=release -Using makefiles: + to build a release version or -1. Change directory to build\msw. Type: + > nmake /f makefile.vc BUILD=release SHARED=1 - 'nmake -f makefile.vc' + to build a release DLL version. Finally, you can also add + "TARGET_CPU=X64" to nmake command line to build Win64 versions + (this only works if you are using a 64 bit compiler, of course). - to make the wxWidgets core library as release DLL. - See "Configuring the Build" for instruction how to build debug or static - libraries. + See "Configuring the Build" for more information about the + additional parameters that can be specified on the command line. -2. Change directory to samples and type 'nmake -f makefile.vc' - to make all the samples. You can also make them individually. +2. To verify your build, change the directory to samples\minimal and + run the same nmake command (with the same parameters there), this + should create a working minimal wxWidgets sample. -Makefile notes: +3. If you need to rebuild, use "clean" target first or "nmake /a". - Use the 'clean' target to clean all objects, libraries and - executables. -Note (1): if you wish to use templates, please edit -include\wx\msw\setup.h and set wxUSE_DEBUG_NEW_ALWAYS to 0. -Without this, the redefinition of 'new' will cause problems in -the headers. Alternatively, #undef new before including template headers. -You will also need to set wxUSE_IOSTREAMH to 0 if you will be -using templates, to avoid the non-template stream files being included -within wxWidgets. +* From the IDE using the provided project files: -Note (2): libraries and applications generated with makefiles and -project files are now (hopefully) compatible where static libraries -are concerned, but please exercise caution nevertheless and if -possible, use one method or the other. +Ready to use project files are provided for VC++ versions 6, 7, 8, 9 +and 10 (also known as MSVS 6, 2003, 2005, 2008 and 2010 respectively). +For VC++ 11 (2012, respectively), you need to import the existing VC10 +project files into VC11 IDE first. -Note (3): some crash problems can be due to inconsistent compiler -options. If strange/weird/impossible things start to happen please -check (dumping IDE project file as makefile and doing text comparison -if necessary) that the project settings, especially the list of defined -symbols, struct packing, etc. are exactly the same for all items in -the project. After this, delete everything (including PCH) and recompile. +Simply open wx_vcN.sln (for N=7, 8, 9 or 10) or wx.dsw (for VC6) file, +select the appropriate configuration (Debug or Release, static or DLL) +and build the solution. Notice that when building a DLL configuration, +you may need to perform the build several times because the projects +are not always built in the correct order, and this may result in link +errors. Simply do the build again, up to 3 times, to fix this. -Note (4): to create your own IDE files, copy .dsp and .dsw -files from an existing wxWidgets sample and adapt them, or -visit http://wiki.wxwidgets.org/Microsoft_Visual_C%2B%2B_Guide. +Notice that x64 configurations are only included in VC10 project +currently. If you want to build Win64 libraries with the previous +compiler versions, the simplest solution is to use the makefiles as +described above. -Microsoft Visual C++ Compilation for 64-bit Windows + +Cygwin/MinGW Compilation ---------------------------------------------------------------- -Visual Studio 2005 includes 64-bit compilers, though they are not installed by -default; you need to select them during the installation. Both native 64-bit -compilers and 32-bit hosted cross compilers are included, so you do not need a -64-bit machine to use them (though you do to run the created executables). -Visual C++ Express Edition does not include 64-bit compilers. +wxWidgets supports Cygwin, MinGW, MinGW-w64 and TDM-GCC tool chains under +Windows. They can be downloaded from: -64-bit compilers are also available in various SDKs, for example -the .NET Framework SDK: - http://msdn.microsoft.com/netframework/programming/64bit/devtools/ + http://www.cygwin.com/ + http://www.mingw.org/ + http://mingw-w64.sourceforge.net/ + http://tdm-gcc.tdragon.net/ -Using project files: +respectively. Please retrieve and install the latest version of your preferred +tool chain by following the instructions provided by these packages. Notice +that Cygwin includes both native Cygwin compiler, which produces binaries that +require Cygwin during run-time, and MinGW[-w64] cross-compilers which can still +be used in Cygwin environment themselves but produce plain Windows binaries +without any special run-time requirements. You will probably want to use the +latter for developing your applications. -1. Open the solution file for the version you use: build\msw\wx_vc8.sln or - wx_vc9.sln. +If using MinGW, you can download the add-on MSYS package to provide Unix-like +tools that you'll need to build wxWidgets using configure. -2. To add 64-bit targets, go to the 'Build' menu and choose 'Configuration - Manager...'. In the 'Active solution platform' drop down choose '', - then you can choose either 'Itanium' or 'x64'. +C++11 note: If you want to compile wxWidgets in C++11 mode, you currently have + to use -std=gnu++11 switch as -std=c++11 disables some extensions + that wxWidgets relies on. I.e. please use CXXFLAGS="-std=gnu++11". - For more detailed instructions see: - http://msdn2.microsoft.com/en-us/library/9yb4317s(en-us,vs.80).aspx +All of these tool chains can be used either with Unix-like configure+make build +process (preferred) or with the provided makefile.gcc makefiles without using +configure: - Note: 64-bit targets created this way will use the build directory of the - corresponding 32-bit target for some files. Therefore after building - for one CPU it is necessary to clean the build before building the - equivalent target for another CPU. We've reported the problem to MS - but they say it is not possible to fix it. +* Using configure -3. To build, go to the 'Build' menu and choose 'Batch Build...'. Tick all the - all the 'x64|Debug' or all the 'Itanium|Debug' projects, and click 'Build'. +This method works in exactly the same way as under Unix systems, +including OS X, and requires a Unix-like environment to work, i.e. +either MSYS or Cygwin. - This will build a debug version of the static libs. The section above on - Visual C++ in general has more information about adjusting the settings to - build other configurations. +0. Open MSYS or Cygwin shell prompt. -4. To compile one of the samples open one of the sample projects, such as - samples\minimal\minimal_vc7.vcproj. Visual Studio will convert the project as in - step 1, then add a 64-bit target as in step 2, and build. +1. Create a build directory: it is is strongly recommended to not + build the library in the directory containing the sources ($WXWIN) + but to create a separate build directory instead. The build + directory can be placed anywhere (using the fastest available disk + may be a good idea), but in this example we create it as a + subdirectory of the source one: -Using makefiles: + $ cd $WXWIN + $ mkdir build-debug -1. Open a 64-bit build command prompt, for either x64 or Itanium. Change - directory to build\msw. Then for x64 type: +2. Run configure passing it any of the options shown by "configure + --help". Notice that configure builds shared libraries by default, + use --disable-shared to build static ones. For example: - nmake -f makefile.vc TARGET_CPU=X64 + $ ../configure --enable-debug - or for Itanium: +3. Build the library: - nmake -f makefile.vc TARGET_CPU=IA64 + $ make - This will build a debug version of wxWidgets DLLs. See "Configuring the - build" for instruction how to build other configurations such as a release - build or static libraries. +4. Test the library build by building the minimal sample: -2. Change to the directory of one of the samples such as samples\minimal. Type - the same command used to build the main library, for example for x64: + $ cd samples/minimal + $ make - nmake -f makefile.vc TARGET_CPU=X64 +5. Optionally install the library in a global location -Notes: + $ make install -The versions of the VC++ 8 compiler included with some SDKs requires an -additional library to be linked or the following error is received. + Notice that there is not much benefice to installing under Windows + so this step can usually be omitted. - LNK2001 unresolved external symbol __security_check_cookie -If you receive this error add bufferoverflowu.lib to link, e.g.: +* Using plain makefiles: + +NOTE: The makefile.gcc makefiles are for compilation under MinGW using + Windows command interpreter (command.com/cmd.exe), they won't work + if you use Unix shell, as is the case with MSYS. Follow the instructions + for using configure above instead if you prefer to use Unix shell. + +0. Open DOS command line window (cmd.exe, *not* Bash sh.exe). + +1. Change directory to %WXWIN%\build\msw and type + + > mingw32-make -f makefile.gcc + + to build wxWidgets in the default debug configuration as a static + library. Add "BUILD=release" and/or "SHARED=1" to build the library + in release configuration and/or as a shared library instead of the + default static one. + +2. To verify your build, change the directory to samples\minimal and + run the same mingw32-make command (with the same parameters there), + this should create a working minimal wxWidgets sample. + +3. If you need to rebuild, use "clean" target first. + - nmake -f makefile.vc TARGET_CPU=X64 LDFLAGS=bufferoverflowu.lib -See http://support.microsoft.com/?id=894573 for more information. Borland C++ Compilation ---------------------------------------------------------------- +WARNING: Borland instructions are out of date, please send us your + corrections if you are using it with wxWidgets 3.0. + The minimum version required is 5.5 (last version supported by BC++ 5.0 was 2.4.2), which can be downloaded for free from: http://www.borland.com/products/downloads/download_cbuilder.html @@ -344,180 +280,56 @@ the following preprocessor directive: (check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for more details) -Watcom C++ 10.6/11 and OpenWatcom Compilation ----------------------------------------------------------------- - -1. Change directory to build\msw. Type 'wmake -f makefile.wat' to - make the wxWidgets core library. - -2. Change directory to samples\minimal and type 'wmake -f makefile.wat' - to make this sample. Repeat for other samples of interest. - -Note (1): if variant.cpp is compiled with date/time class options, the linker - gives up. So the date/time option is switched off for Watcom C++. - Also, wxAutomationObject is not compiled with Watcom C++ 10. - -Note (2): RawBitmaps won't work at present because they use unsupported template - classes - -Note (3): if Watcom can't read the precompiled header when building a sample, - try deleting .pch files in build\msw\wat_* and compiling - the sample again. - -Note (4): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this - compiler doesn't come with standard C++ library headers by default. - If you install STLPort or another STL implementation, you'll need to - edit wx/string.h and remove the check for Digital Mars in it (search - for __WATCOM__). - - -Cygwin/MinGW Compilation ----------------------------------------------------------------- - -wxWidgets supports Cygwin, MinGW, MinGW-w64 and TDM-GCC tool chains under -Windows. They can be downloaded from: - - http://www.cygwin.com/ - http://www.mingw.org/ - http://mingw-w64.sourceforge.net/ - http://tdm-gcc.tdragon.net/ - -respectively. Please retrieve and install the latest version of your preferred -tool chain by following the instructions provided by these packages. Notice -that Cygwin includes both native Cygwin compiler, which produces binaries that -require Cygwin during run-time, and MinGW[-w64] cross-compilers which can still -be used in Cygwin environment themselves but produce plain Windows binaries -without any special run-time requirements. You will probably want to use the -latter for developing your applications. - -If using MinGW, you can download the add-on MSYS package to provide Unix-like -tools that you'll need to build wxWidgets using configure. - -C++11 note: If you want to compile wxWidgets in C++11 mode, you currently have - to use -std=gnu++11 switch as -std=c++11 disables some extensions - that wxWidgets relies on. I.e. please use CXXFLAGS="-std=gnu++11". - -All of these tool chains can be used either with Unix-like configure+make build -process (preferred) or with the provided makefile.gcc makefiles without using -configure: - -Using makefiles Directly ----------------------------------------------------------------- - -NOTE: The makefile.gcc makefiles are for compilation under MinGW using - Windows command interpreter (command.com/cmd.exe), they won't work - if you use Unix shell, as is the case with MSYS. Follow the instructions - for using configure below instead in this case. - -Use the makefile.gcc files for compiling wxWidgets and samples, -e.g. to compile a debugging version of wxWidgets: - > cd c:\wx\build\msw - > mingw32-make -f makefile.gcc BUILD=debug - > cd c:\wx\samples\minimal - > mingw32-make -f makefile.gcc BUILD=debug - (See below for more options.) - -Notice that Windows command interpreter (cmd.exe) and mingw32-make must be -used, using Bash (sh.exe) and make.exe from MSYS will only work when using -configure-based build procedure described below! - -You can also use the 'strip' command to reduce executable/dll size (note that -stripping an executable/dll will remove debug information!). - -All targets have 'clean' targets to allow removal of object files -and other intermediate compiler files. - -Using configure ----------------------------------------------------------------- - -Instead of using the makefiles, you can use the configure -system to generate appropriate makefiles, as used on Unix -and Mac OS X systems. - -Change directory to the root of the wxWidgets distribution, -make a build directory, and run configure and make in this directory. - -For example: - - $ cd $WXWIN - $ mkdir build-debug - $ cd build-debug - $ # Optionally use --disable-shared for static linking - $ ../configure --enable-debug - $ make - $ make install # This step is optional - $ cd samples/minimal - $ make - $ ./minimal.exe - - -DigitalMars C++ Compilation ----------------------------------------------------------------- - -Digital Mars compiler is no longer updated as the project is discontinued. -wxWidgets 2.8 was the last version to compile with this compiler. Configuring the Build ================================================================ -So far the instructions only explain how to build release DLLs of wxWidgets -and did not cover any configuration. It is possible to change many aspects of -the build, including debug/release and static/dynamic settings. +NOTE: If you use configure to build the library with Cygwin/MinGW, the + contents of this section does not apply, just pass the arguments + to configure directly in this case. -Notice that in the previous versions of wxWidgets it was possible to build the -library in either ANSI or Unicode mode but in wxWidgets 2.9 and later only a -single, combined, build mode exists. It is still possible to set UNICODE=0 to -disable Unicode support entirely but it is strongly not recommended and should -be never necessary. - - -Changing the Settings +Library configuration ---------------------------------------------------------------- -There are two ways to modify the settings: either by passing the values as -arguments when invoking make or by editing build\msw\config.$(compiler) file -where $(compiler) is same extension as the makefile you use has (see below). -The latter is good for setting options that never change in your development -process (e.g. GCC_VERSION or VENDOR). If you want to build several versions of -wxWidgets and use them side by side, the former method is better. Settings in -config.* files are shared by all makefiles (samples, contrib, main library), -but if you pass the options as arguments, you must use same arguments you used -for the library when building samples or contrib libraries! +While it is never necessary to do it, you may want to change some of +the options in the include/wx/msw/setup.h file before building wxWidgets. +This file is heavily commented, please read it and enable or disable +the features you would like to compile wxWidgets with[out]. -Examples of invoking make in Unicode debug build (other options described -below are set analogically): +Notice that this file is later copied into a directory under lib for +each of the build configurations which allows to have different +build options for different configurations too if you edit any +configuration-specific file. -Visual C++: - > nmake -f makefile.vc BUILD=debug -Borland C++: - > make -f makefile.bcc -DBUILD=debug - (Note that you have to use -D to set the variable, unlike in other make - tools!) - -Watcom C/C++: - > wmake -f makefile.wat BUILD=debug - -MinGW using native makefiles: - > mingw32-make -f makefile.gcc BUILD=debug - -MinGW using configure: - > ./configure --enable-debug - (see ./configure --help on details; configure is not covered in this - section) - -Cygwin using configure: - > ./configure --disable-precomp-headers --enable-debug - (use --disable-precomp-headers if Cygwin doesn't support precompiled - headers) - -Brief explanation of options and possible values is in every -build\msw\config.* file; more detailed description follows. - -Basic Options +Makefile parameters ---------------------------------------------------------------- +When building using makefiles, you can specify many build settings +(unlike when using the project files where you are limited to choosing +just the configuration and platform). This can be done either by +passing the values as arguments when invoking make or by editing +build\msw\config.$(compiler) file where $(compiler) is same extension +as the makefile you use has (see below). The latter is good for +setting options that never change in your development process (e.g. +GCC_VERSION or VENDOR). If you want to build several versions of +wxWidgets and use them side by side, the former method is better. +Settings in config.* files are shared by all makefiles (including the +samples), but if you pass the options as arguments, you must use same +arguments you used for the library when building samples! + +For example, to build the library in release mode you can either +change the "BUILD" variable definition in build\msw\config.$(compiler) +or use + + > nmake -f makefile.vc BUILD=debug + > mingw32-make -f makefile.gcc BUILD=debug + +depending on the compiler used. + +The full list of the build settings follows: + BUILD=release Builds release version of the library. It differs from default 'debug' in lack of appended 'd' in name of library and uses the release CRT libraries @@ -534,16 +346,13 @@ UNICODE=0 systems and can't use MSLU (which requires MSLU=1) for some reason. This option affect name of the library ('u' is appended in the default - Unicode build) and the directory where the library and setup.h are store + Unicode build) and the directory where the library and setup.h are stored (ditto). WXUNIV=1 Build wxUniversal instead of native wxMSW (see http://www.wxwidgets.org/wxuniv.htm for more information). -Advanced Options ----------------------------------------------------------------- - MONOLITHIC=1 Starting with version 2.5.1, wxWidgets has the ability to be built as several smaller libraries instead of single big one as used to be the case @@ -554,22 +363,13 @@ MONOLITHIC=1 USE_GUI=0 Disable building GUI parts of the library, build only wxBase components used by console applications. Note that if you leave USE_GUI=1 then both wxBase - and GUI libraries are built. If you are building monolithic library, then - you should set wxUSE_GUI to 1 in setup.h. + and GUI libraries are built. -USE_OPENGL=1 - Build wxmsw29_gl.lib library with OpenGL integration class wxGLCanvas. - You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that - OpenGL library is always built as additional library, even in monolithic - build! - -USE_HTML=0 - Do not build wxHTML library. If MONOLITHIC=1, then you must also - #define wxUSE_HTML 1 in setup.h. - -USE_XRC=0 - Do not build XRC resources library. If MONOLITHIC=1, then you must also - #define wxUSE_HTML 1 in setup.h. +USE_$(LIBRARY)=0 + Do not build the corresponding library (all libraries are built by + default). Library which can be disabled in this way are: AUI, HTML, + MEDIA, GL (the option name is USE_OPENGL for this one), PROPGRID, + QA, RIBBON, RICHTEXT, STC, WEBVIEW, XRC. RUNTIME_LIBS=static Links static version of C and C++ runtime libraries into the executable, so @@ -606,6 +406,16 @@ DEBUG_INFO=1 omitted or set to 'default' its value is determined the value of the BUILD option. +DEBUG_RUNTIME_LIBS=0 +DEBUG_RUNTIME_LIBS=1 + (VC++ only.) If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll + is used. By default msvcrtd.dll is used only if the executable + contains debug info and msvcrt.dll if it doesn't. It is sometimes + desirable to build with debug info and still link against msvcrt.dll + (e.g. when you want to ship the app to customers and still have + usable .pdb files with debug information) and this setting makes it + possible. + TARGET_CPU=X64|IA64 (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86 build is performed. @@ -615,14 +425,18 @@ VENDOR= distribute wxWidgets DLLs with your application. Default value is 'custom'. This string is included as part of DLL name. wxWidgets DLLs contain compiler name, version information and vendor name in them. For example - wxmsw290_core_bcc_custom.dll is one of DLLs build using Borland C++ with + wxmsw300_core_vc_custom.dll is one of DLLs build using Visual C++ with default settings. If you set VENDOR=mycorp, the name will change to - wxmsw290_core_bcc_mycorp.dll. + wxmsw300_core_vc_mycorp.dll. CFG= Sets configuration name so that you can have multiple wxWidgets builds with - different setup.h settings coexisting in same tree. See "Object and library - directories" below for more information. + different setup.h settings coexisting in same tree. The value of + this option is appended to the build directories names. This is + useful for building the library in some non-default configuration, + e.g. you could change wxUSE_STL to 1 in include/wx/msw/setup.h and + then build with "CFG=-stl". Alternatively, you could build with e.g. + "RUNTIME_LIBS=static CFG=-mt" when using MSVC. COMPILER_PREFIX= If you build with multiple versions of the same compiler, you can put @@ -631,86 +445,14 @@ COMPILER_PREFIX= convenience variable, you can achieve the same effect (but different directory names) with the CFG option. +CFLAGS +CXXFLAGS +CPPFLAGS +LDFLAGS + Additional flags to be used with C compiler, C++ compiler, C + preprocessor (used for both C and C++ compilation) and linker, + respectively. -Compiler-Specific Options ----------------------------------------------------------------- - -* MinGW - -If you are using gcc-2.95 instead of gcc3, you must set GCC_VERSION to -2.95. In build\msw\config.gcc, change -> GCC_VERSION = 3 -to -> GCC_VERSION = 2.95 - -* Visual C++ - -DEBUG_RUNTIME_LIBS=0 -DEBUG_RUNTIME_LIBS=1 - If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll is used. By default - msvcrtd.dll is used only if the executable contains debug info and - msvcrt.dll if it doesn't. It is sometimes desirable to build with debug info - and still link against msvcrt.dll (e.g. when you want to ship the app to - customers and still have usable .pdb files with debug information) and this - setting makes it possible. - -Fine-tuning the Compiler ----------------------------------------------------------------- - -All makefiles have variables that you can use to specify additional options -passed to the compiler or linker. You won't need this in most cases, but if you -do, simply add desired flags to CFLAGS (for C compiler), CXXFLAGS (for C++ -compiler), CPPFLAGS (for both C and C++ compiler) and LDFLAGS (the linker). - -Object and Library Directories ----------------------------------------------------------------- - -All object files produced during a library build are stored in a directory under -build\msw. Its name is derived from the build settings and CFG variable and from -the compiler name. Examples of directory names: - - build\msw\bcc_msw SHARED=0 - build\msw\bcc_mswdll SHARED=1 - build\msw\bcc_mswunivd SHARED=0, WXUNIV=1, BUILD=debug - build\msw\vc_mswunivd ditto, with Visual C++ - -Libraries and DLLs are copied into a subdirectory of the lib directory with a -name derived from the compiler and a static/DLL setting and setup.h into a -directory with a name that contains other settings: - - lib\bcc_msw - lib\bcc_lib\msw\wx\setup.h - lib\bcc_dll - lib\bcc_dll\msw\wx\setup.h - lib\bcc_lib - lib\bcc_lib\mswunivd\wx\setup.h - lib\vc_lib - lib\vc_lib\mswunivd\wx\setup.h - -Each lib\ subdirectory has wx subdirectory with setup.h as seen above. -This file is copied there from include\wx\msw\setup.h (and if it doesn't exist, -from include\wx\msw\setup0.h) and this is the copy of setup.h that is used by -all samples and should be used by your apps as well. If you are doing changes -to setup.h, you should do them in this file, _not_ in include\wx\msw\setup.h. - -If you set CFG to something, the value is appended to directory names. E.g. -for CFG=MyBuild, you'll have object files in - - build\msw\bcc_mswMyBuild - build\msw\bcc_mswdllMyBuild - etc. - -and libraries in - - lib\bcc_libMyBuild - lib\bcc_dllMyBuild - etc. - -By now it is clear what CFG is for: builds with different CFG settings don't -share any files and they use different setup.h files. For example, this allows -you to have two static debug builds, one with wxUSE_SOCKETS=0 and one with sockets -enabled (without CFG, both of them would be put into same directory and there -would be conflicts between the files). Building Applications Using wxWidgets @@ -741,8 +483,8 @@ following to use wxWidgets: * Add the list of libraries to link with to the linker input. The exact list depends on which libraries you use and whether you built wxWidgets in monolithic or default multlib mode and basically should include all the - relevant libraries from the directory above, e.g. "wxmsw29ud_core.lib - wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib + relevant libraries from the directory above, e.g. "wxmsw30ud_core.lib + wxbase30ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib" for a debug build of an application using the core library only (all wxWidgets applications use the base library). From 59edd80343ddd3a5d99dde4b3f4df8c59857f0d9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Oct 2013 15:48:22 +0000 Subject: [PATCH 4/6] Prepare release notes and such for 3.0.0-rc2. No real changes, just change the RC number. Also update the release date. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 +- docs/publicity/announce.txt | 15 ++++++--------- docs/readme.txt | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f820ed0e2a..aab70beee2 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -567,7 +567,7 @@ Major new features in this release was added. -3.0-RC2: (released 2013-10-xx) +3.0-RC2: (released 2013-10-28) ------------------------------ All: diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 15daa8b3dd..c2c5b0b83e 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,13 +1,13 @@ -October 7, 2013 -- The wxWidgets team is pleased to announce the +October 28, 2013 -- The wxWidgets team is pleased to announce the first release candidate release of wxWidgets 3.0. -wxWidgets 3.0-RC1 is available at +wxWidgets 3.0-RC2 is available at - https://sourceforge.net/downloads/wxwindows/3.0.0-rc1/ + https://sourceforge.net/downloads/wxwindows/3.0.0-rc2/ and at our FTP mirror at - ftp://ftp.wxwidgets.org/pub/3.0.0-rc1/ + ftp://ftp.wxwidgets.org/pub/3.0.0-rc2/ Please choose the archive format suitable for your platform, i.e. 7z or ZIP for Windows platforms and tar.bz2 for the Unix systems @@ -20,10 +20,7 @@ as only sources, not binaries, are installed. We also provide the pre-built versions of wxMSW libraries for the selected compilers at - https://sourceforge.net/downloads/wxwindows/3.0.0/binaries/ - -Notice that 3.0-RC1 does NOT include the binaries, they will be only -available for the final 3.0 release. + https://sourceforge.net/downloads/wxwindows/3.0.0-rc2/binaries/ Please see the README file there for the descriptions of the individual files. @@ -44,7 +41,7 @@ here, but the most important ones are: Please see the changes.txt file in the "docs" subdirectory of wxWidgets distribution or also available online at -https://sourceforge.net/projects/wxwindows/files/3.0.0-rc1/changes.txt +https://sourceforge.net/projects/wxwindows/files/3.0.0-rc2/changes.txt for more details and please read the "INCOMPATIBLE CHANGES" section in its beginning for a brief description of changes if you are upgrading from wxWidgets 2.8. For more details, please see diff --git a/docs/readme.txt b/docs/readme.txt index 7545ad2b52..cf3cb0cc28 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ - wxWidgets 3.0-RC1 Release Notes + wxWidgets 3.0-RC2 Release Notes =============================== Welcome to the latest release of wxWidgets, a free cross-platform C++ @@ -16,11 +16,11 @@ thread handling, and so on. You can learn more about wxWidgets at wxWidgets sources are available for download from - https://sourceforge.net/projects/wxwindows/files/3.0.0/ + https://sourceforge.net/projects/wxwindows/files/3.0.0-rc2/ or - ftp://ftp.wxwidgets.org/pub/3.0.0/ + ftp://ftp.wxwidgets.org/pub/3.0.0-rc2/ Please see the "Files" section below for the description of various files available at these locations. @@ -203,4 +203,4 @@ web site. Have fun! -The wxWidgets Team, July 2013 +The wxWidgets Team, October 2013 From 95140e1eb3c726836446fb20fee1c9ea832bff82 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Oct 2013 15:48:24 +0000 Subject: [PATCH 5/6] Update checksums for the 3.0.0-rc2 release files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/release_files.mdwn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/release_files.mdwn b/docs/release_files.mdwn index 349482d686..bd1c8f172a 100644 --- a/docs/release_files.mdwn +++ b/docs/release_files.mdwn @@ -1,7 +1,7 @@ -wxWidgets 3.0.0-RC1 +wxWidgets 3.0.0-rc2 =================== -This directory contains the files for wxWidgets 3.0.0-rc1 release. +This directory contains the files for wxWidgets 3.0.0-rc2 release. Please notice that since the 2.9 series only a single source distribution is provided instead of the multiple distributions containing only the files for @@ -24,10 +24,10 @@ Check Sums To verify your download you can use the following sha1sums: - 0b6f7fbac35c4e923cc7fa73e9c8d8ad3dd8e085 wxWidgets-3.0.0-rc1.7z - ae15323ae8c7682f65d9bf58e2ae3fff0af5e816 wxWidgets-3.0.0-rc1.tar.bz2 - ca272772d9d5c59372ca976375da600e2d7fc2ee wxWidgets-3.0.0-rc1.zip - f344ffa557a5b24b85b612f08f6fae2cf9ca336f wxWidgets-3.0.0-rc1-docs-chm.zip - 4f120cbbdffd7b837cb1afdfa5f4a4fbe1c160b4 wxWidgets-3.0.0-rc1-docs-html.tar.bz2 - 8ba6522c78b77bb0d3a8fbea6c4f4d0e11ec8d24 wxWidgets-3.0.0-rc1-docs-html.zip - 2334dbd62b137957d31a529ab44fab25ce040320 wxWidgets-3.0.0-rc1_headers.7z + 143b08577a4da2381d32db86cade9a6419353b9d wxWidgets-3.0.0-rc2.7z + edbcb9a105567d2ab4838183dd232317fce8ccc7 wxWidgets-3.0.0-rc2.tar.bz2 + 20b91a32c9e618c7f6dc767d74cc879227c59fdc wxWidgets-3.0.0-rc2.zip + aa77457c4e13de229d7ff83efaff732f530c760d wxWidgets-3.0.0-rc2-docs-html.tar.bz2 + 6ec5137bf53bc55ae0d213ec1c00735e8684981f wxWidgets-3.0.0-rc2-docs-html.zip + 606a25aa73b9b34d3e5434d708a9026c22de1d25 wxWidgets-3.0.0-rc2_headers.7z + From 769061a849a1be9fb3b7317ea1c5ece8ff7739ca Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Oct 2013 20:16:07 +0000 Subject: [PATCH 6/6] Update the version to 3.0.0-rc2 in wx/version.h as well. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/version.h b/include/wx/version.h index c762d9a9f0..904b06f73c 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -29,7 +29,7 @@ #define wxMINOR_VERSION 0 #define wxRELEASE_NUMBER 0 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.0.0 RC1") +#define wxVERSION_STRING wxT("wxWidgets 3.0.0-rc2") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */