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)