Skip to content

Commit 4c1d3d5

Browse files
tablacustablacus
committed
26.6.11 Added ARM64 support.
1 parent e63a4cf commit 4c1d3d5

9 files changed

Lines changed: 119 additions & 9 deletions

File tree

‎del.bat‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,21 @@ del /q /s tewv\x64\*
1818
rmdir tewv\x64\Release
1919
rmdir tewv\x64\Debug
2020
rmdir tewv\x64
21+
del /q /s ARM64\Release\*
22+
rmdir ARM64\Release
23+
del /q /s ARM64\Debug\*
24+
rmdir ARM64\Debug
25+
rmdir ARM64
26+
del /q /s tewv\ARM64\*
27+
rmdir tewv\ARM64\Release
28+
rmdir tewv\ARM64\Debug
29+
rmdir tewv\ARM64
2130
del /q /s *.sdf
2231
rmdir /q /s ipch
2332
rmdir /q /s Debug
2433
rmdir /q /s .vs
34+
rmdir /q /s packages
35+
rmdir /q /s tewv\Debug
36+
rmdir /q /s tewv\Release
37+
rmdir /q /s tewv\x64
38+
rmdir /q /s tewv\ARM64

‎tewv.sln‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual C++ Express 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.37327.16
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tewv", "tewv\tewv.vcxproj", "{BDD47254-2D2A-4984-920A-D52D65949630}"
57
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|ARM64 = Debug|ARM64
811
Debug|Win32 = Debug|Win32
912
Debug|x64 = Debug|x64
13+
Release|ARM64 = Release|ARM64
1014
Release|Win32 = Release|Win32
1115
Release|x64 = Release|x64
1216
EndGlobalSection
1317
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|ARM64.ActiveCfg = Debug|ARM64
19+
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|ARM64.Build.0 = Debug|ARM64
1420
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|Win32.ActiveCfg = Debug|Win32
1521
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|Win32.Build.0 = Debug|Win32
1622
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|x64.ActiveCfg = Debug|x64
1723
{BDD47254-2D2A-4984-920A-D52D65949630}.Debug|x64.Build.0 = Debug|x64
24+
{BDD47254-2D2A-4984-920A-D52D65949630}.Release|ARM64.ActiveCfg = Release|ARM64
25+
{BDD47254-2D2A-4984-920A-D52D65949630}.Release|ARM64.Build.0 = Release|ARM64
1826
{BDD47254-2D2A-4984-920A-D52D65949630}.Release|Win32.ActiveCfg = Release|Win32
1927
{BDD47254-2D2A-4984-920A-D52D65949630}.Release|Win32.Build.0 = Release|Win32
2028
{BDD47254-2D2A-4984-920A-D52D65949630}.Release|x64.ActiveCfg = Release|x64
@@ -23,4 +31,7 @@ Global
2331
GlobalSection(SolutionProperties) = preSolution
2432
HideSolutionNode = FALSE
2533
EndGlobalSection
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {4BB71FB2-3478-499C-8F9E-FF109CC902C7}
36+
EndGlobalSection
2637
EndGlobal

‎tewv/Resource.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define INTERNALNAME "tewv"
44
#define STRING(str) STRING2(str)
55
#define STRING2(str) #str
6-
#define VER_Y 25
6+
#define VER_Y 26
77
#define VER_M 6
8-
#define VER_D 22
8+
#define VER_D 11
99
#define VER_Z 0

‎tewv/tewv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Tablacus WebView2 (C)2020 Gaku
22
// MIT Lisence
3-
// Visual Studio Express 2017 for Windows Desktop
3+
// Visual Studio Express 2017
44
// https://tablacus.github.io/
55

66
#include "tewv.h"

‎tewv/tewv.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
#include "WebView2.h"
1616
#pragma comment (lib, "shlwapi.lib")
1717
#pragma comment (lib, "version.lib")
18-
18+
#if defined(_M_ARM64)
19+
#pragma comment(lib, "kernel32.lib")
20+
#pragma comment(lib, "user32.lib")
21+
#pragma comment(lib, "gdi32.lib")
22+
#pragma comment(lib, "advapi32.lib") // RegCloseKey, EventRegister etc...
23+
#pragma comment(lib, "shell32.lib") // SHGetPathFromIDListW etc...
24+
#pragma comment(lib, "ole32.lib")
25+
#pragma comment(lib, "oleaut32.lib") // SysAllocString, SafeArray etc...
26+
#pragma comment(lib, "uuid.lib")
27+
#endif
1928
#define TE_VT 24
2029
#define TE_VI 0xffffff
2130
#define TE_METHOD 0x60010000

‎tewv/tewv.rc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
2323
VALUE "FileVersion", STRING(VER_Y) "." STRING(VER_M) "." STRING(VER_D) "." STRING(VER_Z) "\0"
2424
VALUE "InternalName", INTERNALNAME "\0"
2525
VALUE "LegalCopyright", "(C) Gaku\0"
26-
#ifdef _WIN64
27-
VALUE "OriginalFilename", INTERNALNAME "64.dll\0"
26+
#if defined(_M_ARM64)
27+
VALUE "OriginalFilename", INTERNALNAME "ARM64.dll\0"
28+
#elif defined(_M_X64)
29+
VALUE "OriginalFilename", INTERNALNAME "64.dll\0"
2830
#else
2931
VALUE "OriginalFilename", INTERNALNAME "32.dll\0"
3032
#endif

‎tewv/tewv.vcxproj‎

Lines changed: 60 additions & 1 deletion
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="4.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>
@@ -22,7 +30,7 @@
2230
<ProjectGuid>{BDD47254-2D2A-4984-920A-D52D65949630}</ProjectGuid>
2331
<RootNamespace>tewv</RootNamespace>
2432
<Keyword>Win32Proj</Keyword>
25-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
33+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
2634
</PropertyGroup>
2735
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2836
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -41,11 +49,21 @@
4149
<CharacterSet>Unicode</CharacterSet>
4250
<PlatformToolset>v141</PlatformToolset>
4351
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
53+
<ConfigurationType>DynamicLibrary</ConfigurationType>
54+
<CharacterSet>Unicode</CharacterSet>
55+
<PlatformToolset>v141</PlatformToolset>
56+
</PropertyGroup>
4457
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4558
<ConfigurationType>DynamicLibrary</ConfigurationType>
4659
<CharacterSet>Unicode</CharacterSet>
4760
<PlatformToolset>v141</PlatformToolset>
4861
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
63+
<ConfigurationType>DynamicLibrary</ConfigurationType>
64+
<CharacterSet>Unicode</CharacterSet>
65+
<PlatformToolset>v141</PlatformToolset>
66+
</PropertyGroup>
4967
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5068
<ImportGroup Label="ExtensionSettings">
5169
</ImportGroup>
@@ -58,9 +76,15 @@
5876
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
5977
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6078
</ImportGroup>
79+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
80+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
81+
</ImportGroup>
6182
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
6283
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6384
</ImportGroup>
85+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
86+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
87+
</ImportGroup>
6488
<PropertyGroup Label="UserMacros" />
6589
<PropertyGroup>
6690
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
@@ -71,12 +95,16 @@
7195
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
7296
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
7397
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
98+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
7499
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
75100
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
101+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
76102
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)32d</TargetName>
77103
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)32</TargetName>
78104
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)64d</TargetName>
105+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectName)64d</TargetName>
79106
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>
107+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectName)arm64</TargetName>
80108
</PropertyGroup>
81109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
82110
<ClCompile>
@@ -124,6 +152,18 @@
124152
<ModuleDefinitionFile>tewv64.def</ModuleDefinitionFile>
125153
</Link>
126154
</ItemDefinitionGroup>
155+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
156+
<ResourceCompile>
157+
<PreprocessorDefinitions>_UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158+
</ResourceCompile>
159+
<Link />
160+
<ClCompile>
161+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
162+
</ClCompile>
163+
<Link>
164+
<ModuleDefinitionFile>tewv64.def</ModuleDefinitionFile>
165+
</Link>
166+
</ItemDefinitionGroup>
127167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
128168
<ClCompile />
129169
<ResourceCompile>
@@ -140,6 +180,22 @@
140180
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
141181
</ClCompile>
142182
</ItemDefinitionGroup>
183+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
184+
<ClCompile />
185+
<ResourceCompile>
186+
<PreprocessorDefinitions>_UNICODE;UNICODE;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
187+
</ResourceCompile>
188+
<Link>
189+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
190+
<GenerateDebugInformation>
191+
</GenerateDebugInformation>
192+
<OptimizeReferences>true</OptimizeReferences>
193+
<ModuleDefinitionFile>tewvarm64.def</ModuleDefinitionFile>
194+
</Link>
195+
<ClCompile>
196+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
197+
</ClCompile>
198+
</ItemDefinitionGroup>
143199
<ItemGroup>
144200
<ClCompile Include="tewv.cpp" />
145201
</ItemGroup>
@@ -162,6 +218,9 @@
162218
<PropertyGroup>
163219
<WebView2LoaderPreference>Static</WebView2LoaderPreference>
164220
</PropertyGroup>
221+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
222+
<OutDir>$(SolutionDir)Release\</OutDir>
223+
</PropertyGroup>
165224
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
166225
<PropertyGroup>
167226
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

‎tewv/tewv.vcxproj.user‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,16 @@
88
<LocalDebuggerCommand>C:\cpp\TE\Debug\TEd64.exe</LocalDebuggerCommand>
99
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1010
</PropertyGroup>
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
12+
<LocalDebuggerCommand>C:\cpp\TE\Debug\TEd64.exe</LocalDebuggerCommand>
13+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
14+
</PropertyGroup>
1115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
1216
<LocalDebuggerCommand>C:\cpp\TE\Debug\TEd64.exe</LocalDebuggerCommand>
1317
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1418
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
20+
<LocalDebuggerCommand>C:\cpp\TE\Debug\TEd64.exe</LocalDebuggerCommand>
21+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
22+
</PropertyGroup>
1523
</Project>

‎tewv/tewvarm64.def‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
LIBRARY "tewvarm64"
2+
3+
EXPORTS
4+
DllCanUnloadNow PRIVATE
5+
DllGetClassObject PRIVATE
6+
DllRegisterServer PRIVATE
7+
DllUnregisterServer PRIVATE

0 commit comments

Comments
 (0)