Skip to content

Commit 6dde63e

Browse files
zhongyang219zhongyang219
authored
Merge pull request #1703 from ekxs0109/master
添加Arm64EC编译配置
2 parents 32af6b5 + f6d1493 commit 6dde63e

File tree

7 files changed

+459
-3
lines changed

7 files changed

+459
-3
lines changed

‎.github/workflows/main.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Release CI
22
on: push
33
jobs:
4+
45
x64_build:
56
runs-on: windows-latest
67

@@ -67,6 +68,41 @@ jobs:
6768
name: x86_${{ steps.current-time.outputs.formattedTime }}_pdb
6869
path: Bin/Release/*.pdb
6970

71+
arm64ec_build:
72+
runs-on: windows-latest
73+
74+
steps:
75+
- uses: actions/checkout@v3
76+
77+
- name: Add msbuild to PATH
78+
uses: microsoft/[email protected]
79+
80+
- name: Run msbuild
81+
run: msbuild -p:configuration=release -p:platform=ARM64EC -p:platformToolset=v143
82+
83+
- name: Get current time
84+
uses: josStorer/[email protected]
85+
id: current-time
86+
with:
87+
format: YYYYMMDD_HHmmss
88+
utcOffset: "+08:00"
89+
90+
- name: Move dll file path
91+
run: mv Bin/x64/Release/*.dll Bin/ARM64EC/Release/
92+
93+
- name : Upload artifact
94+
uses: actions/upload-artifact@v3
95+
with:
96+
name: arm64EC_${{ steps.current-time.outputs.formattedTime }}_TrafficMonitor
97+
path: |
98+
Bin/ARM64EC/Release/TrafficMonitor.exe
99+
Bin/ARM64EC/Release/*.dll
100+
101+
- name : Upload pdb files
102+
uses: actions/upload-artifact@v3
103+
with:
104+
name: arm64EC_${{ steps.current-time.outputs.formattedTime }}_pdb
105+
path: Bin/ARM64EC/Release/*.pdb
70106
# winXP_build:
71107
# runs-on: windows-latest
72108

‎OpenHardwareMonitorApi/OpenHardwareMonitorApi.vcxproj‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64EC">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64EC</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|ARM64EC">
13+
<Configuration>Release</Configuration>
14+
<Platform>ARM64EC</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|Win32">
917
<Configuration>Release</Configuration>
1018
<Platform>Win32</Platform>
@@ -47,13 +55,27 @@
4755
<CLRSupport>true</CLRSupport>
4856
<CharacterSet>Unicode</CharacterSet>
4957
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
59+
<ConfigurationType>DynamicLibrary</ConfigurationType>
60+
<UseDebugLibraries>true</UseDebugLibraries>
61+
<PlatformToolset>v143</PlatformToolset>
62+
<CLRSupport>true</CLRSupport>
63+
<CharacterSet>Unicode</CharacterSet>
64+
</PropertyGroup>
5065
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5166
<ConfigurationType>DynamicLibrary</ConfigurationType>
5267
<UseDebugLibraries>false</UseDebugLibraries>
5368
<PlatformToolset>v143</PlatformToolset>
5469
<CLRSupport>true</CLRSupport>
5570
<CharacterSet>Unicode</CharacterSet>
5671
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" 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>
@@ -68,9 +90,15 @@
6890
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6991
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7092
</ImportGroup>
93+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
94+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
95+
</ImportGroup>
7196
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7297
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7398
</ImportGroup>
99+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
100+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
101+
</ImportGroup>
74102
<PropertyGroup Label="UserMacros" />
75103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76104
<LinkIncremental>true</LinkIncremental>
@@ -82,6 +110,11 @@
82110
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
83111
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\</OutDir>
84112
</PropertyGroup>
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
114+
<LinkIncremental>true</LinkIncremental>
115+
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
116+
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\</OutDir>
117+
</PropertyGroup>
85118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
86119
<LinkIncremental>false</LinkIncremental>
87120
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
@@ -92,6 +125,11 @@
92125
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
93126
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\</OutDir>
94127
</PropertyGroup>
128+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
129+
<LinkIncremental>false</LinkIncremental>
130+
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
131+
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\</OutDir>
132+
</PropertyGroup>
95133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
96134
<ClCompile>
97135
<WarningLevel>Level3</WarningLevel>
@@ -114,6 +152,18 @@
114152
<AdditionalDependencies />
115153
</Link>
116154
</ItemDefinitionGroup>
155+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
156+
<ClCompile>
157+
<WarningLevel>Level3</WarningLevel>
158+
<Optimization>Disabled</Optimization>
159+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);OPENHARDWAREMONITOR_EXPORTS</PreprocessorDefinitions>
160+
<PrecompiledHeader>Use</PrecompiledHeader>
161+
</ClCompile>
162+
<Link>
163+
<AdditionalDependencies>
164+
</AdditionalDependencies>
165+
</Link>
166+
</ItemDefinitionGroup>
117167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
118168
<ClCompile>
119169
<WarningLevel>Level3</WarningLevel>
@@ -134,6 +184,17 @@
134184
<AdditionalDependencies />
135185
</Link>
136186
</ItemDefinitionGroup>
187+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
188+
<ClCompile>
189+
<WarningLevel>Level3</WarningLevel>
190+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);OPENHARDWAREMONITOR_EXPORTS</PreprocessorDefinitions>
191+
<PrecompiledHeader>Use</PrecompiledHeader>
192+
</ClCompile>
193+
<Link>
194+
<AdditionalDependencies>
195+
</AdditionalDependencies>
196+
</Link>
197+
</ItemDefinitionGroup>
137198
<ItemGroup>
138199
<Reference Include="LibreHardwareMonitorLib">
139200
<HintPath>LibreHardwareMonitorLib.dll</HintPath>
@@ -155,8 +216,10 @@
155216
<ClCompile Include="Stdafx.cpp">
156217
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
157218
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
219+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">Create</PrecompiledHeader>
158220
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
159221
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
222+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">Create</PrecompiledHeader>
160223
</ClCompile>
161224
<ClCompile Include="UpdateVisitor.cpp" />
162225
</ItemGroup>

‎PluginDemo/PluginDemo.vcxproj‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64EC">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64EC</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|ARM64EC">
13+
<Configuration>Release</Configuration>
14+
<Platform>ARM64EC</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|Win32">
917
<Configuration>Release</Configuration>
1018
<Platform>Win32</Platform>
@@ -48,6 +56,13 @@
4856
<CharacterSet>Unicode</CharacterSet>
4957
<UseOfMfc>Dynamic</UseOfMfc>
5058
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
60+
<ConfigurationType>DynamicLibrary</ConfigurationType>
61+
<UseDebugLibraries>true</UseDebugLibraries>
62+
<PlatformToolset>v143</PlatformToolset>
63+
<CharacterSet>Unicode</CharacterSet>
64+
<UseOfMfc>Dynamic</UseOfMfc>
65+
</PropertyGroup>
5166
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5267
<ConfigurationType>DynamicLibrary</ConfigurationType>
5368
<UseDebugLibraries>false</UseDebugLibraries>
@@ -56,6 +71,14 @@
5671
<CharacterSet>Unicode</CharacterSet>
5772
<UseOfMfc>Dynamic</UseOfMfc>
5873
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
75+
<ConfigurationType>DynamicLibrary</ConfigurationType>
76+
<UseDebugLibraries>false</UseDebugLibraries>
77+
<PlatformToolset>v143</PlatformToolset>
78+
<WholeProgramOptimization>true</WholeProgramOptimization>
79+
<CharacterSet>Unicode</CharacterSet>
80+
<UseOfMfc>Dynamic</UseOfMfc>
81+
</PropertyGroup>
5982
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6083
<ImportGroup Label="ExtensionSettings">
6184
</ImportGroup>
@@ -70,9 +93,15 @@
7093
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
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)'=='Debug|ARM64EC'" Label="PropertySheets">
97+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98+
</ImportGroup>
7399
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74100
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
75101
</ImportGroup>
102+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
103+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
104+
</ImportGroup>
76105
<PropertyGroup Label="UserMacros" />
77106
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
78107
<LinkIncremental>true</LinkIncremental>
@@ -89,11 +118,21 @@
89118
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
90119
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\plugins\</OutDir>
91120
</PropertyGroup>
121+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
122+
<LinkIncremental>true</LinkIncremental>
123+
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
124+
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\plugins\</OutDir>
125+
</PropertyGroup>
92126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
93127
<LinkIncremental>false</LinkIncremental>
94128
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
95129
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\plugins\</OutDir>
96130
</PropertyGroup>
131+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
132+
<LinkIncremental>false</LinkIncremental>
133+
<IncludePath>$(ProjectDir)..\include;$(IncludePath)</IncludePath>
134+
<OutDir>$(SolutionDir)Bin\$(Platform)\$(Configuration)\plugins\</OutDir>
135+
</PropertyGroup>
97136
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
98137
<ClCompile>
99138
<WarningLevel>Level3</WarningLevel>
@@ -146,6 +185,22 @@
146185
<EnableUAC>false</EnableUAC>
147186
</Link>
148187
</ItemDefinitionGroup>
188+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
189+
<ClCompile>
190+
<WarningLevel>Level3</WarningLevel>
191+
<SDLCheck>true</SDLCheck>
192+
<PreprocessorDefinitions>_DEBUG;PLUGINDEMO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193+
<ConformanceMode>true</ConformanceMode>
194+
<PrecompiledHeader>Use</PrecompiledHeader>
195+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
196+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
197+
</ClCompile>
198+
<Link>
199+
<SubSystem>Windows</SubSystem>
200+
<GenerateDebugInformation>true</GenerateDebugInformation>
201+
<EnableUAC>false</EnableUAC>
202+
</Link>
203+
</ItemDefinitionGroup>
149204
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150205
<ClCompile>
151206
<WarningLevel>Level3</WarningLevel>
@@ -166,6 +221,26 @@
166221
<EnableUAC>false</EnableUAC>
167222
</Link>
168223
</ItemDefinitionGroup>
224+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
225+
<ClCompile>
226+
<WarningLevel>Level3</WarningLevel>
227+
<FunctionLevelLinking>true</FunctionLevelLinking>
228+
<IntrinsicFunctions>true</IntrinsicFunctions>
229+
<SDLCheck>true</SDLCheck>
230+
<PreprocessorDefinitions>NDEBUG;PLUGINDEMO_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231+
<ConformanceMode>true</ConformanceMode>
232+
<PrecompiledHeader>Use</PrecompiledHeader>
233+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
234+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
235+
</ClCompile>
236+
<Link>
237+
<SubSystem>Windows</SubSystem>
238+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
239+
<OptimizeReferences>true</OptimizeReferences>
240+
<GenerateDebugInformation>true</GenerateDebugInformation>
241+
<EnableUAC>false</EnableUAC>
242+
</Link>
243+
</ItemDefinitionGroup>
169244
<ItemGroup>
170245
<ClInclude Include="..\include\PluginInterface.h" />
171246
<ClInclude Include="CustomDrawItem.h" />
@@ -184,9 +259,11 @@
184259
<ClCompile Include="OptionsDlg.cpp" />
185260
<ClCompile Include="pch.cpp">
186261
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
262+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">Create</PrecompiledHeader>
187263
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
188264
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
189265
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
266+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">Create</PrecompiledHeader>
190267
</ClCompile>
191268
<ClCompile Include="PluginDemo.cpp" />
192269
<ClCompile Include="PluginSystemDate.cpp" />

0 commit comments

Comments
 (0)