Skip to content

Commit 14883d3

Browse files
jameschartersjamescharters
authored
Merge f5ef76a into b5fef3b 
2 parents b5fef3b + f5ef76a commit 14883d3

22 files changed

Lines changed: 509 additions & 72 deletions

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<Configuration>Debug</Configuration>
1414
<Platform>x64</Platform>
1515
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Debug|arm64">
17+
<Configuration>Debug</Configuration>
18+
<Platform>arm64</Platform>
19+
</ProjectConfiguration>
1620
<ProjectConfiguration Include="Release|Win32">
1721
<Configuration>Release</Configuration>
1822
<Platform>Win32</Platform>
@@ -21,6 +25,10 @@
2125
<Configuration>Release</Configuration>
2226
<Platform>x64</Platform>
2327
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Release|arm64">
29+
<Configuration>Release</Configuration>
30+
<Platform>arm64</Platform>
31+
</ProjectConfiguration>
2432
</ItemGroup>
2533
<PropertyGroup Label="Globals">
2634
<ProjectGuid>{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}</ProjectGuid>
@@ -43,6 +51,12 @@
4351
<CLRSupport>true</CLRSupport>
4452
<CharacterSet>Unicode</CharacterSet>
4553
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="Configuration">
55+
<ConfigurationType>DynamicLibrary</ConfigurationType>
56+
<UseDebugLibraries>true</UseDebugLibraries>
57+
<CLRSupport>true</CLRSupport>
58+
<CharacterSet>Unicode</CharacterSet>
59+
</PropertyGroup>
4660
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4761
<ConfigurationType>DynamicLibrary</ConfigurationType>
4862
<UseDebugLibraries>false</UseDebugLibraries>
@@ -55,6 +69,12 @@
5569
<CLRSupport>true</CLRSupport>
5670
<CharacterSet>Unicode</CharacterSet>
5771
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="Configuration">
73+
<ConfigurationType>DynamicLibrary</ConfigurationType>
74+
<UseDebugLibraries>false</UseDebugLibraries>
75+
<CLRSupport>true</CLRSupport>
76+
<CharacterSet>Unicode</CharacterSet>
77+
</PropertyGroup>
5878
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5979
<ImportGroup Label="ExtensionSettings">
6080
</ImportGroup>
@@ -64,12 +84,18 @@
6484
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6585
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6686
</ImportGroup>
87+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'" Label="PropertySheets">
88+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
89+
</ImportGroup>
6790
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6891
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6992
</ImportGroup>
7093
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7194
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7295
</ImportGroup>
96+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'" Label="PropertySheets">
97+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98+
</ImportGroup>
7399
<PropertyGroup Label="UserMacros" />
74100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75101
<LinkIncremental>true</LinkIncremental>
@@ -87,6 +113,14 @@
87113
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
88114
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
89115
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
117+
<LinkIncremental>true</LinkIncremental>
118+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
119+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
120+
<OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
121+
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
122+
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
123+
</PropertyGroup>
90124
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
91125
<LinkIncremental>false</LinkIncremental>
92126
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
@@ -101,6 +135,13 @@
101135
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
102136
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
103137
</PropertyGroup>
138+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
139+
<LinkIncremental>false</LinkIncremental>
140+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
141+
<OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
142+
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
143+
<SourcePath>$(SolutionDir)packages\$(CefSdkVer)\CEF;$(SourcePath)</SourcePath>
144+
</PropertyGroup>
104145
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
105146
<ClCompile>
106147
<WarningLevel>Level3</WarningLevel>
@@ -138,6 +179,24 @@
138179
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
139180
</Link>
140181
</ItemDefinitionGroup>
182+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
183+
<ClCompile>
184+
<WarningLevel>Level3</WarningLevel>
185+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
186+
<Optimization>Disabled</Optimization>
187+
<PreprocessorDefinitions>WIN32;_DEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
188+
<PrecompiledHeader>Use</PrecompiledHeader>
189+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
190+
<LanguageStandard>stdcpp20</LanguageStandard>
191+
<CompileAs>CompileAsCpp</CompileAs>
192+
</ClCompile>
193+
<Link>
194+
<GenerateDebugInformation>true</GenerateDebugInformation>
195+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;User32.lib</AdditionalDependencies>
196+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);</AdditionalLibraryDirectories>
197+
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
198+
</Link>
199+
</ItemDefinitionGroup>
141200
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
142201
<ClCompile>
143202
<WarningLevel>Level3</WarningLevel>
@@ -171,6 +230,22 @@
171230
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
172231
</Link>
173232
</ItemDefinitionGroup>
233+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
234+
<ClCompile>
235+
<WarningLevel>Level3</WarningLevel>
236+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
237+
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
238+
<PrecompiledHeader>Use</PrecompiledHeader>
239+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
240+
<LanguageStandard>stdcpp20</LanguageStandard>
241+
<CompileAs>CompileAsCpp</CompileAs>
242+
</ClCompile>
243+
<Link>
244+
<GenerateDebugInformation>true</GenerateDebugInformation>
245+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib</AdditionalDependencies>
246+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
247+
</Link>
248+
</ItemDefinitionGroup>
174249
<ItemGroup>
175250
<Reference Include="System" />
176251
<Reference Include="System.Core" />
@@ -245,8 +320,10 @@
245320
<ClCompile Include="Stdafx.cpp">
246321
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
247322
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
323+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">Create</PrecompiledHeader>
248324
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
249325
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
326+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">Create</PrecompiledHeader>
250327
</ClCompile>
251328
<ClCompile Include="TypeUtils.cpp" />
252329
<ClCompile Include="Serialization\V8Serialization.cpp" />

‎CefSharp.BrowserSubprocess/CefSharp.BrowserSubprocess.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<PropertyGroup>
33
<TargetFramework>net462</TargetFramework>
44
<OutputType>WinExe</OutputType>
5-
<Platforms>x86;x64</Platforms>
5+
<Platforms>x86;x64;arm64</Platforms>
6+
<PlatformTarget Condition="'$(Platform)' == 'arm64'">arm64</PlatformTarget>
67
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
78
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
89
<SignAssembly>true</SignAssembly>
910
<AssemblyOriginatorKeyFile>..\CefSharp.snk</AssemblyOriginatorKeyFile>
1011
<ApplicationManifest>app.manifest</ApplicationManifest>
1112
<StartupObject>CefSharp.BrowserSubprocess.Program</StartupObject>
12-
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
13+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1314
</PropertyGroup>
1415

1516
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -41,6 +42,6 @@
4142
</PackageReference>
4243
</ItemGroup>
4344
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
44-
<Exec Command="if $(PlatformName) == x86 (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars32.bat&quot;&#xD;&#xA; editbin /largeaddressaware /TSAWARE &quot;$(TargetPath)&quot; &#xD;&#xA; sn -R &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\CefSharp.snk&quot;&#xD;&#xA;) else (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars64.bat&quot;&#xD;&#xA; editbin /TSAWARE /STACK:8388608 &quot;$(TargetPath)&quot;&#xD;&#xA; sn -R &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\CefSharp.snk&quot;&#xD;&#xA;)" />
45+
<Exec Command="if $(PlatformName) == x86 (&#xD;&#xA; if /I &quot;%PROCESSOR_ARCHITECTURE%&quot; == &quot;ARM64&quot; (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvarsall.bat&quot; arm64_x86&#xD;&#xA; ) else (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars32.bat&quot;&#xD;&#xA; )&#xD;&#xA; editbin /largeaddressaware /TSAWARE &quot;$(TargetPath)&quot; &#xD;&#xA; sn -R &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\CefSharp.snk&quot;&#xD;&#xA;) else if $(PlatformName) == x64 (&#xD;&#xA; if /I &quot;%PROCESSOR_ARCHITECTURE%&quot; == &quot;ARM64&quot; (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvarsall.bat&quot; arm64_x64&#xD;&#xA; ) else (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars64.bat&quot;&#xD;&#xA; )&#xD;&#xA; editbin /TSAWARE /STACK:8388608 &quot;$(TargetPath)&quot;&#xD;&#xA; sn -R &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\CefSharp.snk&quot;&#xD;&#xA;) else if $(PlatformName) == arm64 (&#xD;&#xA; if /I &quot;%PROCESSOR_ARCHITECTURE%&quot; == &quot;ARM64&quot; (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvarsall.bat&quot; arm64&#xD;&#xA; ) else (&#xD;&#xA; call &quot;$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvarsamd64_arm64.bat&quot;&#xD;&#xA; )&#xD;&#xA; editbin /TSAWARE /STACK:8388608 &quot;$(TargetPath)&quot;&#xD;&#xA; sn -R &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\CefSharp.snk&quot;&#xD;&#xA;)" />
4546
</Target>
4647
</Project>

0 commit comments

Comments
 (0)