From f7fc914c27922a0944dc8140dc2a1ebb66cfab73 Mon Sep 17 00:00:00 2001 From: andylsn Date: Mon, 15 Jan 2024 13:38:20 -0800 Subject: Fix build errors for osrfx2_dchu_extension loose/tight solutions (#1069) * Update exclusive.csv * Fix extension_loose solution and projects * Fix extension_tight projects * Minor update * Update exclusions.csv * Update exclusions.csv - Undo my prior edit --------- Co-authored-by: Shunni Li Co-authored-by: JakobL-MSFT <110699333+JakobL-MSFT@users.noreply.github.com> --- exclusions.csv | 4 +- .../osrfx2_DCHU_component.vcxproj | 56 ++++++++++++++++++---- .../osrfx2_DCHU_componentsoftware.vcxproj | 7 ++- .../osrfx2_DCHU_extension.sln | 33 +++++++------ .../osrfx2_DCHU_extension.vcxproj | 16 ++++++- .../osrfx2_DCHU_componentsoftware.vcxproj | 13 ++++- .../osrfx2_DCHU_extension.vcxproj | 7 ++- 7 files changed, 107 insertions(+), 29 deletions(-) diff --git a/exclusions.csv b/exclusions.csv index 38655ed9..0188f7ed 100644 --- a/exclusions.csv +++ b/exclusions.csv @@ -1,7 +1,7 @@ Path,Configurations,MinBuild,MaxBuild,Reason audio\acx\samples\audiocodec\driver,*,,22621,Only NI: error C1083: Cannot open include file: 'acx.h': No such file or directory -general\dchu\osrfx2_dchu_extension_loose,*,,,Needs fix for project not found -general\dchu\osrfx2_dchu_extension_tight,*,,,LINK : error LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification +general\dchu\osrfx2_dchu_extension_loose,*,,22621,Only NI: Fails to build +general\dchu\osrfx2_dchu_extension_tight,*,,22621,Only NI: Fails to build general\winhec 2017 lab\toaster driver,*,,,Needs input from end user general\winhec 2017 lab\toaster support app,*,,,Needs input from end user network\trans\wfpsampler,*,,,Missing INF section; missing libs diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.vcxproj b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.vcxproj index bc19d287..0f66871c 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.vcxproj @@ -35,35 +35,35 @@ - - - - + - + - + - + + {F90EFA96-B075-4531-B4E1-F406362D16BF} {4605da2c-74a5-4865-98e1-152ef136825f} - v4.5 + + 12.0 Debug Win32 osrfx2_DCHU_component osrfx2_DCHU_component + $(LatestTargetPlatformVersion) @@ -74,6 +74,7 @@ Package true Universal + true Windows10 @@ -83,6 +84,7 @@ Package true Universal + true Windows10 @@ -92,6 +94,7 @@ Package true Universal + true Windows10 @@ -101,6 +104,7 @@ Package true Universal + true Windows10 @@ -109,6 +113,8 @@ Utility Package true + Universal + true Windows10 @@ -117,6 +123,8 @@ Utility Package true + Universal + true Windows10 @@ -125,6 +133,8 @@ Utility Package true + Universal + true Windows10 @@ -133,6 +143,8 @@ Utility Package true + Universal + true @@ -152,6 +164,8 @@ True 133563 + $(SolutionDir)$(Platform)\$(ConfigurationName)\ + osrfx2_DCHU_component DbgengRemoteDebugger @@ -163,6 +177,8 @@ True 133563 + $(SolutionDir)$(Platform)\$(ConfigurationName)\ + osrfx2_DCHU_component DbgengRemoteDebugger @@ -174,6 +190,7 @@ True 133563 + osrfx2_DCHU_component DbgengRemoteDebugger @@ -185,6 +202,7 @@ True 133563 + osrfx2_DCHU_component DbgengRemoteDebugger @@ -196,6 +214,9 @@ True 133563 + osrfx2_DCHU_component + true + 10_$(DDKPlatform) DbgengRemoteDebugger @@ -207,6 +228,9 @@ True 133563 + osrfx2_DCHU_component + true + 10_$(DDKPlatform) DbgengRemoteDebugger @@ -218,6 +242,8 @@ True 133563 + osrfx2_DCHU_component + 10_$(DDKPlatform) DbgengRemoteDebugger @@ -229,6 +255,8 @@ True 133563 + osrfx2_DCHU_component + 10_$(DDKPlatform) @@ -244,11 +272,17 @@ 1.0.0.0 + + sha256 + 1.0.0.0 + + sha256 + @@ -264,11 +298,17 @@ 1.0.0.0 + + sha256 + 1.0.0.0 + + sha256 + diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj index 8819665e..c0a78bea 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj @@ -72,18 +72,22 @@ true + $(SolutionDir)$(Platform)\$(Configuration)\ true $(ProjectName) + $(SolutionDir)$(Platform)\$(Configuration)\ false + $(SolutionDir)$(Platform)\$(Configuration)\ false $(ProjectName) .exe + $(SolutionDir)$(Platform)\$(Configuration)\ @@ -101,7 +105,8 @@ - Use + + Level3 Disabled _DEBUG;_CONSOLE;%(PreprocessorDefinitions) diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension.sln b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension.sln index db62aca0..bf339b93 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension.sln +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrfx2_DCHU_extension", "osrfx2_DCHU_extension\osrfx2_DCHU_extension.vcxproj", "{0588DF70-3923-42E6-8DC9-13C2C0186F20}" EndProject @@ -14,40 +14,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrfx2_DCHU_componentsoftwa EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|ARM.ActiveCfg = Debug|Win32 + {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|ARM64.ActiveCfg = Debug|Win32 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x64.ActiveCfg = Debug|x64 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x64.Build.0 = Debug|x64 - {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x64.Deploy.0 = Debug|x64 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x86.ActiveCfg = Debug|Win32 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x86.Build.0 = Debug|Win32 - {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Debug|x86.Deploy.0 = Debug|Win32 + {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|ARM.ActiveCfg = Release|Win32 + {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|ARM64.ActiveCfg = Release|Win32 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x64.ActiveCfg = Release|x64 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x64.Build.0 = Release|x64 - {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x64.Deploy.0 = Release|x64 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x86.ActiveCfg = Release|Win32 {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x86.Build.0 = Release|Win32 - {0588DF70-3923-42E6-8DC9-13C2C0186F20}.Release|x86.Deploy.0 = Release|Win32 + {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|ARM.ActiveCfg = Debug|Win32 + {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|ARM64.ActiveCfg = Debug|Win32 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x64.ActiveCfg = Debug|x64 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x64.Build.0 = Debug|x64 - {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x64.Deploy.0 = Debug|x64 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x86.ActiveCfg = Debug|Win32 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x86.Build.0 = Debug|Win32 - {F90EFA96-B075-4531-B4E1-F406362D16BF}.Debug|x86.Deploy.0 = Debug|Win32 + {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|ARM.ActiveCfg = Release|Win32 + {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|ARM64.ActiveCfg = Release|Win32 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x64.ActiveCfg = Release|x64 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x64.Build.0 = Release|x64 - {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x64.Deploy.0 = Release|x64 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x86.ActiveCfg = Release|Win32 {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x86.Build.0 = Release|Win32 - {F90EFA96-B075-4531-B4E1-F406362D16BF}.Release|x86.Deploy.0 = Release|Win32 + {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|ARM.ActiveCfg = Debug|Win32 + {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|ARM64.ActiveCfg = Debug|Win32 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|x64.ActiveCfg = Debug|x64 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|x64.Build.0 = Debug|x64 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|x86.ActiveCfg = Debug|Win32 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Debug|x86.Build.0 = Debug|Win32 + {26D91630-B8FF-4102-A258-32F7D1C84E20}.Release|ARM.ActiveCfg = Release|Win32 + {26D91630-B8FF-4102-A258-32F7D1C84E20}.Release|ARM64.ActiveCfg = Release|Win32 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Release|x64.ActiveCfg = Release|x64 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Release|x64.Build.0 = Release|x64 {26D91630-B8FF-4102-A258-32F7D1C84E20}.Release|x86.ActiveCfg = Release|Win32 @@ -56,11 +64,6 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0588DF70-3923-42E6-8DC9-13C2C0186F20} = {4577857A-CCAE-42EB-BDE2-16C1E3DC7B14} - {F90EFA96-B075-4531-B4E1-F406362D16BF} = {E148C50E-31A6-423E-A867-526FD51DA164} - {26D91630-B8FF-4102-A258-32F7D1C84E20} = {272BE7AA-9011-46FA-96C9-2051C9526476} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FA4B1275-A81F-4DE1-B6E2-930648D7E245} EndGlobalSection diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj index 1a0a21a3..b6a0ed57 100644 --- a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj @@ -24,12 +24,14 @@ {0588DF70-3923-42E6-8DC9-13C2C0186F20} {4605da2c-74a5-4865-98e1-152ef136825f} - v4.6.1 + + 12.0 Debug Win32 osrfx2_DCHU_extension osrfx2_DCHU_extension + $(LatestTargetPlatformVersion) @@ -40,6 +42,7 @@ Package true Universal + true Windows10 @@ -49,6 +52,7 @@ Package true Universal + true Windows10 @@ -58,6 +62,7 @@ Package true Universal + true Windows10 @@ -67,6 +72,7 @@ Package true Universal + true @@ -86,6 +92,8 @@ True 133563 + osrfx2_DCHU_extension + $(SolutionDir)$(Platform)\$(ConfigurationName)\ DbgengRemoteDebugger @@ -97,6 +105,8 @@ True 133563 + osrfx2_DCHU_extension + $(SolutionDir)$(Platform)\$(ConfigurationName)\ DbgengRemoteDebugger @@ -108,6 +118,8 @@ True 133563 + osrfx2_DCHU_extension + $(SolutionDir)$(Platform)\$(ConfigurationName)\ DbgengRemoteDebugger @@ -119,6 +131,8 @@ True 133563 + osrfx2_DCHU_extension + $(SolutionDir)$(Platform)\$(ConfigurationName)\ DbgengRemoteDebugger diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj index 24bd79ea..bb404712 100644 --- a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_componentsoftware/osrfx2_DCHU_componentsoftware.vcxproj @@ -71,11 +71,22 @@ - true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(ProjectName) + + false + + + false + + + true + + + true + Use diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj index 557c8a24..70a91866 100644 --- a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj +++ b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.vcxproj @@ -31,7 +31,8 @@ {0588DF70-3923-42E6-8DC9-13C2C0186F20} {4605da2c-74a5-4865-98e1-152ef136825f} - v4.6.1 + + 12.0 osrfx2_DCHU_extension osrfx2_DCHU_extension @@ -46,6 +47,7 @@ Package true Universal + true Windows10 @@ -55,6 +57,7 @@ Package true Universal + true Windows10 @@ -64,6 +67,7 @@ Package true Universal + true Windows10 @@ -73,6 +77,7 @@ Package true Universal + true -- cgit v1.3.1