diff options
| -rw-r--r-- | Directory.Build.props | 9 | ||||
| -rw-r--r-- | packages.config | 2 | ||||
| -rw-r--r-- | prm/PrmFunc/prmfuncsample.vcxproj | 3 | ||||
| -rw-r--r-- | storage/class/classpnp/src/classpnp.vcxproj | 2 | ||||
| -rw-r--r-- | storage/msdsm/src/SampleDSM.vcxproj | 4 | ||||
| -rw-r--r-- | usb/UcmCxUcsi/UcmCxUcsi.vcxproj | 2 | ||||
| -rw-r--r-- | usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.vcxproj | 4 | ||||
| -rw-r--r-- | video/KMDOD/Sample/SampleDisplay.vcxproj | 8 | ||||
| -rw-r--r-- | wmi/wmiacpi/acpimof.vcxproj | 2 | ||||
| -rw-r--r-- | wmi/wmisamp/WmiSamp.vcxproj | 1 |
10 files changed, 22 insertions, 15 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 19d85cd4..2aab8266 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,7 @@ <Project> -<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props')"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props')"/> +<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/> <Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26052.1000-preview.ge-release\build\native\Microsoft.Windows.SDK.cpp.props')"/> -<!-- <PropertyGroup> - <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\MyProps.props</ForceImportBeforeCppProps> -</PropertyGroup> --> </Project> diff --git a/packages.config b/packages.config index 55fd7b63..0976b9f0 100644 --- a/packages.config +++ b/packages.config @@ -2,5 +2,7 @@ <packages> <package id="Microsoft.Windows.SDK.CPP" version="10.0.26052.1000-preview.ge-release" targetFramework="native" /> <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26052.1000-preview.ge-release" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26052.1000-preview.ge-release" targetFramework="native" /> <package id="Microsoft.Windows.WDK.x64" version="10.0.26052.1000-preview.ge-release" targetFramework="native" /> + <package id="Microsoft.Windows.WDK.arm64" version="10.0.26052.1000-preview.ge-release" targetFramework="native" /> </packages> diff --git a/prm/PrmFunc/prmfuncsample.vcxproj b/prm/PrmFunc/prmfuncsample.vcxproj index 3cc3181d..55465018 100644 --- a/prm/PrmFunc/prmfuncsample.vcxproj +++ b/prm/PrmFunc/prmfuncsample.vcxproj @@ -61,6 +61,7 @@ <WarningLevel>Level4</WarningLevel> <ExceptionHandling> </ExceptionHandling> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -72,7 +73,7 @@ <WarningLevel>Level4</WarningLevel> <ExceptionHandling> </ExceptionHandling> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/storage/class/classpnp/src/classpnp.vcxproj b/storage/class/classpnp/src/classpnp.vcxproj index 4b092509..3b4316b1 100644 --- a/storage/class/classpnp/src/classpnp.vcxproj +++ b/storage/class/classpnp/src/classpnp.vcxproj @@ -314,7 +314,7 @@ </ItemGroup> <Exec Command="if not exist "%(CustomBuildTarget0Input.Identity)" copy ".\%(CustomBuildTarget0Input.Filename)%(CustomBuildTarget0Input.Extension)" "%(CustomBuildTarget0Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -Amendment:ms_409 -MFL:$(IntDir)\MFL.MFL -MOF:$(IntDir)\MOF.MOF "%(CustomBuildTarget0Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> - <Exec Command="wmimofck -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> + <Exec Command=""$(WmimofckToolPath)\wmimofck.exe" -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -B:".\$(IntDir)\classlog.bmf" $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> </Target> <ItemGroup> diff --git a/storage/msdsm/src/SampleDSM.vcxproj b/storage/msdsm/src/SampleDSM.vcxproj index 5387d218..fe3104b8 100644 --- a/storage/msdsm/src/SampleDSM.vcxproj +++ b/storage/msdsm/src/SampleDSM.vcxproj @@ -285,7 +285,7 @@ </ItemGroup> <Exec Command="if not exist "%(CustomBuildTarget0Input.Identity)" copy ".\%(CustomBuildTarget0Input.Filename)%(CustomBuildTarget0Input.Extension)" "%(CustomBuildTarget0Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -Amendment:ms_409 -MFL:$(IntDir)\MFL.MFL -MOF:$(IntDir)\MOF.MOF "%(CustomBuildTarget0Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> - <Exec Command="wmimofck -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> + <Exec Command=""$(WmimofckToolPath)\wmimofck.exe" -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -B:".\$(IntDir)\msdsm.bmf" $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> </Target> <Target Name="Custom Build Target 2" BeforeTargets="$(BuildGenerateSourcesTargets)"> @@ -294,7 +294,7 @@ </ItemGroup> <Exec Command="if not exist "%(CustomBuildTarget2Input.Identity)" copy ".\%(CustomBuildTarget2Input.Filename)%(CustomBuildTarget2Input.Extension)" "%(CustomBuildTarget2Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -Amendment:ms_409 -MFL:$(IntDir)\MFL.MFL -MOF:$(IntDir)\MOF.MOF "%(CustomBuildTarget2Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> - <Exec Command="wmimofck -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> + <Exec Command=""$(WmimofckToolPath)\wmimofck.exe" -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -B:".\$(IntDir)\msdsmdsm.bmf" $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> </Target> <ItemGroup> diff --git a/usb/UcmCxUcsi/UcmCxUcsi.vcxproj b/usb/UcmCxUcsi/UcmCxUcsi.vcxproj index 66355942..35b53adb 100644 --- a/usb/UcmCxUcsi/UcmCxUcsi.vcxproj +++ b/usb/UcmCxUcsi/UcmCxUcsi.vcxproj @@ -90,7 +90,7 @@ <ItemDefinitionGroup> <ClCompile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);.;$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> <WppEnabled>true</WppEnabled> <WppRecorderEnabled>true</WppRecorderEnabled> <WppScanConfigurationData>trace.h</WppScanConfigurationData> diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.vcxproj b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.vcxproj index 136932e7..610fcc44 100644 --- a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.vcxproj +++ b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.vcxproj @@ -86,6 +86,7 @@ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <DisableSpecificWarnings>4100;4189;5208;%(DisableSpecificWarnings)</DisableSpecificWarnings> <SupportJustMyCode>false</SupportJustMyCode> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>$(DDK_LIB_PATH)\UcmUcsi\1.0\UcmUcsiCxStub.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -99,6 +100,7 @@ <WppEnabled>true</WppEnabled> <DisableSpecificWarnings>4100;4189;5208;%(DisableSpecificWarnings)</DisableSpecificWarnings> <SupportJustMyCode>false</SupportJustMyCode> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>$(DDK_LIB_PATH)\UcmUcsi\1.0\UcmUcsiCxStub.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -111,6 +113,7 @@ <ClCompile> <WppEnabled>true</WppEnabled> <DisableSpecificWarnings>4100;4189;5208;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>$(DDK_LIB_PATH)\UcmUcsi\1.0\UcmUcsiCxStub.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -123,6 +126,7 @@ <ClCompile> <WppEnabled>true</WppEnabled> <DisableSpecificWarnings>4100;4189;5208;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Link> <AdditionalDependencies>$(DDK_LIB_PATH)\UcmUcsi\1.0\UcmUcsiCxStub.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/video/KMDOD/Sample/SampleDisplay.vcxproj b/video/KMDOD/Sample/SampleDisplay.vcxproj index 30a147c5..6dfa431c 100644 --- a/video/KMDOD/Sample/SampleDisplay.vcxproj +++ b/video/KMDOD/Sample/SampleDisplay.vcxproj @@ -83,7 +83,7 @@ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> </ResourceCompile> <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Midl> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> @@ -97,7 +97,7 @@ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> </ResourceCompile> <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Midl> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> @@ -111,7 +111,7 @@ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> </ResourceCompile> <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Midl> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> @@ -125,7 +125,7 @@ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> </ResourceCompile> <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);$(KIT_SHARED_INC_PATH_WDK)</AdditionalIncludeDirectories> </ClCompile> <Midl> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories> diff --git a/wmi/wmiacpi/acpimof.vcxproj b/wmi/wmiacpi/acpimof.vcxproj index 15803d3c..2d4225e2 100644 --- a/wmi/wmiacpi/acpimof.vcxproj +++ b/wmi/wmiacpi/acpimof.vcxproj @@ -181,7 +181,7 @@ </ItemGroup> <Exec Command="if not exist "%(CustomBuildTarget1Input.Identity)" copy ".\%(CustomBuildTarget1Input.Filename)%(CustomBuildTarget1Input.Extension)" "%(CustomBuildTarget1Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -Amendment:ms_409 -MFL:$(IntDir)\MFL.MFL -MOF:$(IntDir)\MOF.MOF "%(CustomBuildTarget1Input.Identity)"" WorkingDirectory="$(MSBuildProjectDirectory)" /> - <Exec Command="wmimofck -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> + <Exec Command=""$(WmimofckToolPath)\wmimofck.exe" -y$(IntDir)\MOF.MOF -z$(IntDir)\MFL.MFL $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> <Exec Command="mofcomp -B:".\$(IntDir)\acpimof.bmf" $(IntDir)\MOFMFL.MOF" WorkingDirectory="$(MSBuildProjectDirectory)" /> </Target> <ItemGroup> diff --git a/wmi/wmisamp/WmiSamp.vcxproj b/wmi/wmisamp/WmiSamp.vcxproj index a0ae2b2a..d4b3ff34 100644 --- a/wmi/wmisamp/WmiSamp.vcxproj +++ b/wmi/wmisamp/WmiSamp.vcxproj @@ -87,6 +87,7 @@ <HexdumpOutputFile>.\$(IntDir)\wmisamp.x</HexdumpOutputFile> <HtmlOutputDirectory>.\$(IntDir)\htm</HtmlOutputDirectory> <HtmlUIOutputDirectory>true</HtmlUIOutputDirectory> + <ToolPath>$(WmimofckToolPath)</ToolPath> </Wmimofck> </ItemGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |