Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update TestMcro sample to target a single architecture and support best practices #837

Merged
merged 3 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wia/copywia.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ rem WIA 1.0
rem

copy microdrv\%build_samples%\%cpu_samples%\testmcro.dll %1wiabins\drivers
copy microdrv\testmcro.inf %1wiabins\drivers
copy microdrv\%build_samples%\%cpu_samples%\testmcro.inf %1wiabins\drivers
copy "%build_tools%\%cpu_tools%\wiatest.exe" %1wiabins

if /I "%DDK_TARGET_OS%" EQU "WinXP" (
Expand Down
74 changes: 0 additions & 74 deletions wia/microdrv/testmcro.inf

This file was deleted.

Binary file added wia/microdrv/testmcro.inx
Binary file not shown.
9 changes: 8 additions & 1 deletion wia/microdrv/testmcro.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
<ItemGroup Label="WrappedTaskItems" />
<ItemGroup Label="WrappedTaskItems">
<Inf Include="testmcro.inx">
<Architecture>$(InfArch)</Architecture>
<SpecifyArchitecture>true</SpecifyArchitecture>
<Verbose>true</Verbose>
<CopyOutput>.\$(IntDir)\testmcro.inf</CopyOutput>
</Inf>
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>testmcro</TargetName>
</PropertyGroup>
Expand Down