Skip to content

Commit 6d80ed9

Browse files
MaxSAGMaxSAG
authored
Merge pull request #6 from ScriptAndGo/refactoring/arm64
Create ARM64 version
2 parents be3b36e + bb6ac85 commit 6d80ed9

13 files changed

Lines changed: 281 additions & 8 deletions

File tree

‎CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
77
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
88
<Configurations>Debug;Release</Configurations>
9-
<Platforms>x86;x64</Platforms>
9+
<Platforms>x86;x64;ARM64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<AppDesigner Include="Properties\" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.2" />
16-
<PackageReference Include="MMaitre.MediaCaptureWPF" Version="1.2.0" />
16+
<PackageReference Include="MMaitre.MediaCaptureWPF" Version="1.3.0" />
1717
</ItemGroup>
1818
</Project>

‎CaptureTestApp/CaptureTestApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
77
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
88
<Configurations>Debug;Release</Configurations>
9-
<Platforms>x86;x64</Platforms>
9+
<Platforms>x86;x64;ARM64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<AppDesigner Include="Properties\" />

‎MediaCaptureWPF.Native/MediaCaptureWPF.Native.vcxproj‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
@@ -9,6 +13,10 @@
913
<Configuration>Debug</Configuration>
1014
<Platform>x64</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM64">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="Release|Win32">
1321
<Configuration>Release</Configuration>
1422
<Platform>Win32</Platform>
@@ -40,6 +48,13 @@
4048
<CLRSupport>true</CLRSupport>
4149
<CharacterSet>Unicode</CharacterSet>
4250
</PropertyGroup>
51+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
52+
<ConfigurationType>DynamicLibrary</ConfigurationType>
53+
<UseDebugLibraries>true</UseDebugLibraries>
54+
<PlatformToolset>v143</PlatformToolset>
55+
<CLRSupport>true</CLRSupport>
56+
<CharacterSet>Unicode</CharacterSet>
57+
</PropertyGroup>
4358
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4459
<ConfigurationType>DynamicLibrary</ConfigurationType>
4560
<UseDebugLibraries>false</UseDebugLibraries>
@@ -54,6 +69,13 @@
5469
<CLRSupport>true</CLRSupport>
5570
<CharacterSet>Unicode</CharacterSet>
5671
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
73+
<ConfigurationType>DynamicLibrary</ConfigurationType>
74+
<UseDebugLibraries>false</UseDebugLibraries>
75+
<PlatformToolset>v143</PlatformToolset>
76+
<CLRSupport>true</CLRSupport>
77+
<CharacterSet>Unicode</CharacterSet>
78+
</PropertyGroup>
5779
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5880
<ImportGroup Label="ExtensionSettings">
5981
</ImportGroup>
@@ -63,12 +85,18 @@
6385
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6486
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6587
</ImportGroup>
88+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
89+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
90+
</ImportGroup>
6691
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6792
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6893
</ImportGroup>
6994
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7095
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7196
</ImportGroup>
97+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
98+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
99+
</ImportGroup>
72100
<PropertyGroup Label="UserMacros" />
73101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74102
<LinkIncremental>true</LinkIncremental>
@@ -78,6 +106,10 @@
78106
<LinkIncremental>true</LinkIncremental>
79107
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
80108
</PropertyGroup>
109+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
110+
<LinkIncremental>true</LinkIncremental>
111+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
112+
</PropertyGroup>
81113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
82114
<LinkIncremental>false</LinkIncremental>
83115
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
@@ -86,6 +118,10 @@
86118
<LinkIncremental>false</LinkIncremental>
87119
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
88120
</PropertyGroup>
121+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
122+
<LinkIncremental>false</LinkIncremental>
123+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
124+
</PropertyGroup>
89125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90126
<ClCompile>
91127
<WarningLevel>Level3</WarningLevel>
@@ -110,6 +146,18 @@
110146
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
111147
</Link>
112148
</ItemDefinitionGroup>
149+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
150+
<ClCompile>
151+
<WarningLevel>Level3</WarningLevel>
152+
<Optimization>Disabled</Optimization>
153+
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154+
<PrecompiledHeader>Use</PrecompiledHeader>
155+
</ClCompile>
156+
<Link>
157+
<GenerateDebugInformation>true</GenerateDebugInformation>
158+
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
159+
</Link>
160+
</ItemDefinitionGroup>
113161
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
114162
<ClCompile>
115163
<WarningLevel>Level3</WarningLevel>
@@ -134,6 +182,18 @@
134182
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
135183
</Link>
136184
</ItemDefinitionGroup>
185+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
186+
<ClCompile>
187+
<WarningLevel>Level3</WarningLevel>
188+
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189+
<PrecompiledHeader>Use</PrecompiledHeader>
190+
</ClCompile>
191+
<Link>
192+
<GenerateDebugInformation>true</GenerateDebugInformation>
193+
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
194+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
195+
</Link>
196+
</ItemDefinitionGroup>
137197
<ItemGroup>
138198
<Reference Include="PresentationCore" />
139199
<Reference Include="System" />
@@ -155,8 +215,10 @@
155215
<ClCompile Include="Stdafx.cpp">
156216
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
157217
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
218+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
158219
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
159220
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
221+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
160222
</ClCompile>
161223
</ItemGroup>
162224
<ItemGroup>

‎MediaCaptureWPF.sln‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.14.36603.0 d17.14
4+
VisualStudioVersion = 17.14.36603.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaCaptureWPF.Native", "MediaCaptureWPF.Native\MediaCaptureWPF.Native.vcxproj", "{21717C88-442C-47EB-94D5-0405CB3CDD9F}"
77
EndProject
@@ -19,60 +19,88 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaptureTestApp.NuGet", "Cap
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|ARM64 = Debug|ARM64
2223
Debug|x64 = Debug|x64
2324
Debug|x86 = Debug|x86
25+
Release|ARM64 = Release|ARM64
2426
Release|x64 = Release|x64
2527
Release|x86 = Release|x86
2628
EndGlobalSection
2729
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|ARM64.ActiveCfg = Debug|ARM64
31+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|ARM64.Build.0 = Debug|ARM64
2832
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.ActiveCfg = Debug|x64
2933
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.Build.0 = Debug|x64
3034
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.ActiveCfg = Debug|Win32
3135
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.Build.0 = Debug|Win32
36+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|ARM64.ActiveCfg = Release|ARM64
37+
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|ARM64.Build.0 = Release|ARM64
3238
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.ActiveCfg = Release|x64
3339
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.Build.0 = Release|x64
3440
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.ActiveCfg = Release|Win32
3541
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.Build.0 = Release|Win32
42+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|ARM64.ActiveCfg = Debug|ARM64
43+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|ARM64.Build.0 = Debug|ARM64
3644
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.ActiveCfg = Debug|x64
3745
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.Build.0 = Debug|x64
3846
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.ActiveCfg = Debug|x86
3947
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.Build.0 = Debug|x86
48+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|ARM64.ActiveCfg = Release|ARM64
49+
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|ARM64.Build.0 = Release|ARM64
4050
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.ActiveCfg = Release|x64
4151
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.Build.0 = Release|x64
4252
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.ActiveCfg = Release|x86
4353
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.Build.0 = Release|x86
54+
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|ARM64.ActiveCfg = Debug|ARM64
55+
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|ARM64.Build.0 = Debug|ARM64
4456
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.ActiveCfg = Debug|x64
4557
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.Build.0 = Debug|x64
4658
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.ActiveCfg = Debug|Win32
4759
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.Build.0 = Debug|Win32
60+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|ARM64.ActiveCfg = Release|ARM64
61+
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|ARM64.Build.0 = Release|ARM64
4862
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.ActiveCfg = Release|x64
4963
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.Build.0 = Release|x64
5064
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.ActiveCfg = Release|Win32
5165
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.Build.0 = Release|Win32
66+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|ARM64.ActiveCfg = Debug|ARM64
67+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|ARM64.Build.0 = Debug|ARM64
5268
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.ActiveCfg = Debug|x64
5369
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.Build.0 = Debug|x64
5470
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.ActiveCfg = Debug|x86
5571
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.Build.0 = Debug|x86
72+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|ARM64.ActiveCfg = Release|ARM64
73+
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|ARM64.Build.0 = Release|ARM64
5674
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.ActiveCfg = Release|x64
5775
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.Build.0 = Release|x64
5876
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.ActiveCfg = Release|x86
5977
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.Build.0 = Release|x86
78+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|ARM64.ActiveCfg = Debug|ARM64
79+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|ARM64.Build.0 = Debug|ARM64
6080
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.ActiveCfg = Debug|x64
6181
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.Build.0 = Debug|x64
6282
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.ActiveCfg = Debug|Win32
6383
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.Build.0 = Debug|Win32
84+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|ARM64.ActiveCfg = Release|ARM64
85+
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|ARM64.Build.0 = Release|ARM64
6486
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.ActiveCfg = Release|x64
6587
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.Build.0 = Release|x64
6688
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.ActiveCfg = Release|Win32
6789
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.Build.0 = Release|Win32
90+
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
6891
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x64.ActiveCfg = Debug|x64
6992
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x86.ActiveCfg = Debug|Win32
93+
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|ARM64.ActiveCfg = Release|ARM64
7094
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x64.ActiveCfg = Release|x64
7195
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x86.ActiveCfg = Release|Win32
96+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|ARM64.ActiveCfg = Debug|ARM64
97+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|ARM64.Build.0 = Debug|ARM64
7298
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.ActiveCfg = Debug|x64
7399
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.Build.0 = Debug|x64
74100
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.ActiveCfg = Debug|x86
75101
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.Build.0 = Debug|x86
102+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|ARM64.ActiveCfg = Release|ARM64
103+
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|ARM64.Build.0 = Release|ARM64
76104
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.ActiveCfg = Release|x64
77105
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.Build.0 = Release|x64
78106
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x86.ActiveCfg = Release|x86

‎MediaCaptureWPF/MediaCaptureWPF.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
77
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
88
<Configurations>Debug;Release</Configurations>
9-
<Platforms>x86;x64</Platforms>
9+
<Platforms>x86;x64;ARM64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<Compile Remove="Properties\**" />

0 commit comments

Comments
 (0)