From d2c881061d1545ff449ca64b72c2c4bdc37d622b Mon Sep 17 00:00:00 2001 From: Adonais Romero González Date: Thu, 1 Jun 2023 15:48:54 -0700 Subject: [network/wlan/WDI] Rename configurations (#988) --- exclusions.csv | 1 - network/wlan/WDI/COMMON/common.vcxproj | 22 ++++++------ network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj | 36 +++++++++---------- network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj | 28 +++++++-------- .../wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj | 20 +++++------ network/wlan/WDI/windows.msbuild.rtwssample.sln | 40 +++++++++++----------- 6 files changed, 73 insertions(+), 74 deletions(-) diff --git a/exclusions.csv b/exclusions.csv index af7bb3e3..83e5a880 100644 --- a/exclusions.csv +++ b/exclusions.csv @@ -5,7 +5,6 @@ general\dchu\osrfx2_dchu_extension_tight,Wrong Toolset - needs migration 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 -network\wlan\wdi,Invalid architecture print\oem printer customization plug-in samples\c++,Invalid architecture print\v4printdriversamples\printerextensionsample,Invalid architecture tree,Missing headers diff --git a/network/wlan/WDI/COMMON/common.vcxproj b/network/wlan/WDI/COMMON/common.vcxproj index 7f177241..e6f6a941 100644 --- a/network/wlan/WDI/COMMON/common.vcxproj +++ b/network/wlan/WDI/COMMON/common.vcxproj @@ -1,12 +1,12 @@  - - Win10 Debug + + Debug x64 - - Win10 Release + + Release x64 @@ -15,7 +15,7 @@ StaticLibrary KMDF $(ProjectName) - Win10 Debug + Debug @@ -34,12 +34,12 @@ Win8 True - + Windows10 True Windows Driver - + Windows10 False Windows Driver @@ -48,7 +48,7 @@ DbgengKernelDebugger DbgengRemoteDebugger - + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 @@ -56,7 +56,7 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); - + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 @@ -64,7 +64,7 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); - + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\; true @@ -112,7 +112,7 @@ sha256 - + true $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\; diff --git a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj index 7fe68165..30586499 100644 --- a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj +++ b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj @@ -1,28 +1,28 @@  - - Win10 Debug + + Debug Arm - - Win10 Debug + + Debug Win32 - - Win10 Debug + + Debug x64 - - Win10 Release + + Release Arm - - Win10 Release + + Release Win32 - - Win10 Release + + Release x64 @@ -132,7 +132,7 @@ WindowsV6.3 True - + Windows10 True Mobile @@ -145,7 +145,7 @@ WindowsV6.3 False - + Windows10 False Mobile @@ -158,7 +158,7 @@ WindowsV6.3 True - + Windows10 True @@ -178,7 +178,7 @@ WindowsV6.3 False - + Windows10 False @@ -198,7 +198,7 @@ WindowsV6.3 True - + Windows10 True @@ -218,7 +218,7 @@ WindowsV6.3 False - + Windows10 False diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj index 5770eb62..cfc0e2fa 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj +++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj @@ -1,12 +1,12 @@  - - Win10 Debug + + Debug x64 - - Win10 Release + + Release x64 @@ -30,13 +30,13 @@ {105EA485-B9B6-48AE-B8B0-96BBEA575973} - + Windows10 True Windows Driver true - + Windows10 False Windows Driver @@ -46,7 +46,7 @@ DbgengKernelDebugger DbgengRemoteDebugger - + http://timestamp.verisign.com/scripts/timstamp.dll true 10_x64;$(Inf2CatWindowsVersionList) @@ -59,7 +59,7 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); - + .sys $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); @@ -72,7 +72,7 @@ true http://timestamp.verisign.com/scripts/timstamp.dll - + true $(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6; @@ -125,7 +125,7 @@ sha256 - + $(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6; None @@ -184,19 +184,19 @@ - + - + - + - + diff --git a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj index eecb8f97..a7bdea25 100644 --- a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj +++ b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj @@ -1,12 +1,12 @@  - - Win10 Debug + + Debug x64 - - Win10 Release + + Release x64 @@ -31,12 +31,12 @@ {C0A51792-1338-4294-ADAA-EDC4EE30CF05} - + Windows10 True Windows Driver - + Windows10 False Windows Driver @@ -45,7 +45,7 @@ DbgengKernelDebugger DbgengRemoteDebugger - + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 @@ -53,7 +53,7 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); - + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 @@ -61,7 +61,7 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); - + true $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\; @@ -111,7 +111,7 @@ sha256 - + true $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\; diff --git a/network/wlan/WDI/windows.msbuild.rtwssample.sln b/network/wlan/WDI/windows.msbuild.rtwssample.sln index ccca5278..291992f1 100644 --- a/network/wlan/WDI/windows.msbuild.rtwssample.sln +++ b/network/wlan/WDI/windows.msbuild.rtwssample.sln @@ -15,28 +15,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdisComm", "PLATFORM\NdisCo EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Win10 Debug|x64 = Win10 Debug|x64 - Win10 Release|x64 = Win10 Release|x64 + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64 - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.Build.0 = Win10 Debug|x64 - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64 - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.Build.0 = Win10 Release|x64 - {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.Build.0 = Win10 Debug|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.Build.0 = Win10 Release|x64 - {956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.Build.0 = Win10 Debug|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.Build.0 = Win10 Release|x64 - {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.ActiveCfg = Debug|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Build.0 = Debug|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Deploy.0 = Debug|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.ActiveCfg = Release|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.Build.0 = Release|x64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.Deploy.0 = Release|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.ActiveCfg = Debug|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.Build.0 = Debug|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.Deploy.0 = Debug|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.ActiveCfg = Release|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.Build.0 = Release|x64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.Deploy.0 = Release|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.ActiveCfg = Debug|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.Build.0 = Debug|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.Deploy.0 = Debug|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.ActiveCfg = Release|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.Build.0 = Release|x64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.3.1