]> xenbits.xensource.com Git - pvdrivers/win/xencons.git/commitdiff
projects / pvdrivers / win / xencons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50d9222)
Remove "Win32" as a build target from VS2022 projects
authorOwen Smith <owen.smith@cloud.com>
Mon, 20 Nov 2023 14:17:30 +0000 (14:17 +0000)
committerPaul Durrant <pdurrant@amazon.com>
Mon, 11 Dec 2023 16:18:55 +0000 (16:18 +0000)
VS2022 is used with EWDK 22621 and later. Win32 is no longer a valid build
target for this set of tools

Signed-off-by: Owen Smith <owen.smith@cloud.com>
vs2022/configs.props patch | blob | blame | history
vs2022/package/package.vcxproj patch | blob | blame | history
vs2022/targets.props patch | blob | blame | history
vs2022/xencons.sln patch | blob | blame | history
vs2022/xencons/xencons.vcxproj patch | blob | blame | history
vs2022/xencons_monitor/xencons_monitor.vcxproj patch | blob | blame | history
vs2022/xencons_tty/xencons_tty.vcxproj patch | blob | blame | history

diff --git a/vs2022/configs.props b/vs2022/configs.props
index df5f23af31d1c5dcba183c96c03ca6a11e30d334..63d8dd4a8aeee642d616268ebb67c7e00be23c55 100644 (file)
--- a/vs2022/configs.props
+++ b/vs2022/configs.props
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
        <ItemGroup Label="ProjectConfigurations">
-               <ProjectConfiguration Include="Windows 10 Debug|Win32">
-                       <Configuration>Windows 10 Debug</Configuration>
-                       <Platform>Win32</Platform>
-                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
-               </ProjectConfiguration>
-               <ProjectConfiguration Include="Windows 10 Release|Win32">
-                       <Configuration>Windows 10 Release</Configuration>
-                       <Platform>Win32</Platform>
-                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
-               </ProjectConfiguration>
                <ProjectConfiguration Include="Windows 10 Debug|x64">
                        <Configuration>Windows 10 Debug</Configuration>
                        <Platform>x64</Platform>
diff --git a/vs2022/package/package.vcxproj b/vs2022/package/package.vcxproj
index 77cf565b59a65dbc5a53f60a92833ffa889c7028..23857efb94445b2492b9d893ef4f43ada8ef3819 100644 (file)
--- a/vs2022/package/package.vcxproj
+++ b/vs2022/package/package.vcxproj
@@ -18,7 +18,6 @@
   <PropertyGroup>
     <EnableInf2cat>true</EnableInf2cat>
     <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">10_x64;Server10_x64;ServerRS5_X64;ServerFE_X64;10_CO_X64</Inf2CatWindowsVersionList>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">10_x86</Inf2CatWindowsVersionList>
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <EnableDeployment>False</EnableDeployment>
     <ImportToStore>False</ImportToStore>
@@ -56,7 +55,6 @@
     <FilesToPackage Include="..\xencons.inf" />
   </ItemGroup>
   <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
-    <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
     <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vs2022/targets.props b/vs2022/targets.props
index 53a866286e76ae4b24da811497b599c4ee9d5f4e..3c31b6ca090c3b9027828d0f4764ea97ef98e320 100644 (file)
--- a/vs2022/targets.props
+++ b/vs2022/targets.props
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|Win32'">
-               <TargetVersion>Windows10</TargetVersion>
-               <UseDebugLibraries>true</UseDebugLibraries>
-       </PropertyGroup>
-       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Release|Win32'">
-               <TargetVersion>Windows10</TargetVersion>
-               <UseDebugLibraries>false</UseDebugLibraries>
-       </PropertyGroup>
        <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|x64'">
                <TargetVersion>Windows10</TargetVersion>
                <UseDebugLibraries>true</UseDebugLibraries>
diff --git a/vs2022/xencons.sln b/vs2022/xencons.sln
index a3603ed6932afff527fc0ddbdf532399fee3fe51..bb6758fd986a68cd850c3c7668d62349e1bbcf06 100644 (file)
--- a/vs2022/xencons.sln
+++ b/vs2022/xencons.sln
@@ -29,54 +29,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "package\package.
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Windows 10 Debug|Win32 = Windows 10 Debug|Win32
                Windows 10 Debug|x64 = Windows 10 Debug|x64
-               Windows 10 Release|Win32 = Windows 10 Release|Win32
                Windows 10 Release|x64 = Windows 10 Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {65FA97EA-A569-4FC1-BFE7-D68E109143F7}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
-               {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
                {4674B8C2-876B-4F2A-AB71-BAC968A9B529}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
-               {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {8991F0A5-408B-43E0-88CC-9550D4AAE616}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-               {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {79D98F83-5A2F-4DE6-B62C-530D70B88C3F}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
-               {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
-               {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
                {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
                {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
-               {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
-               {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
                {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
                {8B5B8F4B-7FF3-4B64-AC4A-5246026217E7}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
        EndGlobalSection
diff --git a/vs2022/xencons/xencons.vcxproj b/vs2022/xencons/xencons.vcxproj
index 2f5e3fe54acf14484657de6ae0995c777b68b9ac..511c2ae21fcc87ee040a463a2331b756545f9545 100644 (file)
--- a/vs2022/xencons/xencons.vcxproj
+++ b/vs2022/xencons/xencons.vcxproj
@@ -39,11 +39,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/vs2022/xencons_monitor/xencons_monitor.vcxproj b/vs2022/xencons_monitor/xencons_monitor.vcxproj
index f94d26d42ce539d7b828437629afe6c87bfa753e..a14203f8efb32048c0764b1490ce3619df7c6bb0 100644 (file)
--- a/vs2022/xencons_monitor/xencons_monitor.vcxproj
+++ b/vs2022/xencons_monitor/xencons_monitor.vcxproj
@@ -41,16 +41,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x86 -dll -noentry -out:%(Outputs) %(Inputs)</Command>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/vs2022/xencons_tty/xencons_tty.vcxproj b/vs2022/xencons_tty/xencons_tty.vcxproj
index 303f15897a950696e266c17f8dbca3af6d34a91e..73e4d6f08e81746af6ca5b211c3cc9fee333efc5 100644 (file)
--- a/vs2022/xencons_tty/xencons_tty.vcxproj
+++ b/vs2022/xencons_tty/xencons_tty.vcxproj
@@ -38,11 +38,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Windows PV Console Driver