From 3462e9bcc439f02da53ae4d176d646d65a039b72 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Aug 2021 14:06:42 +0100 Subject: [PATCH] Add dependency of xrc library on html one in MSVS solutions This fixes sporadic errors when building DLL configurations as the html library build could have been still in progress when xrc library, requiring it, was linked. --- build/msw/wx_vc10.sln | 4 ++++ build/msw/wx_vc11.sln | 4 ++++ build/msw/wx_vc12.sln | 4 ++++ build/msw/wx_vc14.sln | 4 ++++ build/msw/wx_vc15.sln | 4 ++++ build/msw/wx_vc16.sln | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/build/msw/wx_vc10.sln b/build/msw/wx_vc10.sln index f0dd96cc61..664c82e21b 100644 --- a/build/msw/wx_vc10.sln +++ b/build/msw/wx_vc10.sln @@ -76,6 +76,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -511,4 +512,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal diff --git a/build/msw/wx_vc11.sln b/build/msw/wx_vc11.sln index 8512ffee51..c1f0f428f6 100644 --- a/build/msw/wx_vc11.sln +++ b/build/msw/wx_vc11.sln @@ -76,6 +76,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -511,4 +512,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal diff --git a/build/msw/wx_vc12.sln b/build/msw/wx_vc12.sln index 6b7f680f9a..2c47ac1c11 100644 --- a/build/msw/wx_vc12.sln +++ b/build/msw/wx_vc12.sln @@ -78,6 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -513,4 +514,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal diff --git a/build/msw/wx_vc14.sln b/build/msw/wx_vc14.sln index f384886c5d..c68361c7f1 100644 --- a/build/msw/wx_vc14.sln +++ b/build/msw/wx_vc14.sln @@ -78,6 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -513,4 +514,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal diff --git a/build/msw/wx_vc15.sln b/build/msw/wx_vc15.sln index f1aa83c830..890ede050a 100644 --- a/build/msw/wx_vc15.sln +++ b/build/msw/wx_vc15.sln @@ -78,6 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -513,4 +514,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal diff --git a/build/msw/wx_vc16.sln b/build/msw/wx_vc16.sln index ae6f0cbb50..885d8aa305 100644 --- a/build/msw/wx_vc16.sln +++ b/build/msw/wx_vc16.sln @@ -78,6 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_xrc.vcxproj", "{0 ProjectSection(ProjectDependencies) = postProject {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} + {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" @@ -513,4 +514,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9573173-F5F1-495A-BF75-ACA8F75AF11A} + EndGlobalSection EndGlobal