Skip to content

Commit f659734

Browse files
beruberu
authored
Merge e776d7f into 04e81a0 
2 parents 04e81a0 + e776d7f commit f659734

22 files changed

+205
-24
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/MinGW
1717
/Win32
1818
/x64
19+
/ARM64
1920
Backup
2021
build-wrapper-win-x86*
2122
bw-output

‎HeaderMake/HeaderMake.vcxproj‎

Lines changed: 70 additions & 2 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|ARM64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
711
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|ARM64">
13+
<Configuration>Release</Configuration>
14+
<Platform>ARM64</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Release|Win32">
917
<Configuration>Release</Configuration>
1018
<Platform>Win32</Platform>
@@ -22,19 +30,34 @@
2230
<CharacterSet>Unicode</CharacterSet>
2331
<WholeProgramOptimization>true</WholeProgramOptimization>
2432
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
34+
<ConfigurationType>Application</ConfigurationType>
35+
<CharacterSet>Unicode</CharacterSet>
36+
<WholeProgramOptimization>true</WholeProgramOptimization>
37+
</PropertyGroup>
2538
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2639
<ConfigurationType>Application</ConfigurationType>
2740
<CharacterSet>Unicode</CharacterSet>
2841
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
43+
<ConfigurationType>Application</ConfigurationType>
44+
<CharacterSet>Unicode</CharacterSet>
45+
</PropertyGroup>
2946
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3047
<ImportGroup Label="ExtensionSettings">
3148
</ImportGroup>
3249
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3350
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3451
</ImportGroup>
52+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
53+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54+
</ImportGroup>
3555
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3656
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3757
</ImportGroup>
58+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
3861
<PropertyGroup Label="UserMacros">
3962
<IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
4063
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -45,9 +68,15 @@
4568
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4669
<LinkIncremental>true</LinkIncremental>
4770
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
72+
<LinkIncremental>true</LinkIncremental>
73+
</PropertyGroup>
4874
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4975
<LinkIncremental>false</LinkIncremental>
5076
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
78+
<LinkIncremental>false</LinkIncremental>
79+
</PropertyGroup>
5180
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5281
<ClCompile>
5382
<Optimization>Disabled</Optimization>
@@ -58,7 +87,7 @@
5887
<WarningLevel>Level3</WarningLevel>
5988
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
6089
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
61-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
90+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
6291
</ClCompile>
6392
<Link>
6493
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -68,6 +97,26 @@
6897
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
6998
</Link>
7099
</ItemDefinitionGroup>
100+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
101+
<ClCompile>
102+
<Optimization>Disabled</Optimization>
103+
<PreprocessorDefinitions>WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
105+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
106+
<PrecompiledHeader>
107+
</PrecompiledHeader>
108+
<WarningLevel>Level3</WarningLevel>
109+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
110+
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
111+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
112+
</ClCompile>
113+
<Link>
114+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
115+
<GenerateDebugInformation>true</GenerateDebugInformation>
116+
<SubSystem>Console</SubSystem>
117+
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
118+
</Link>
119+
</ItemDefinitionGroup>
71120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
72121
<ClCompile>
73122
<PreprocessorDefinitions>WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -76,7 +125,7 @@
76125
<WarningLevel>Level3</WarningLevel>
77126
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
78127
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
79-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
128+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
80129
</ClCompile>
81130
<Link>
82131
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -87,6 +136,25 @@
87136
<TargetMachine>MachineX86</TargetMachine>
88137
</Link>
89138
</ItemDefinitionGroup>
139+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
140+
<ClCompile>
141+
<PreprocessorDefinitions>WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
143+
<PrecompiledHeader>
144+
</PrecompiledHeader>
145+
<WarningLevel>Level3</WarningLevel>
146+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
147+
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
148+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
149+
</ClCompile>
150+
<Link>
151+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
152+
<GenerateDebugInformation>false</GenerateDebugInformation>
153+
<SubSystem>Console</SubSystem>
154+
<OptimizeReferences>true</OptimizeReferences>
155+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
156+
</Link>
157+
</ItemDefinitionGroup>
90158
<ItemGroup>
91159
<ClCompile Include="HeaderMake.cpp" />
92160
</ItemGroup>

‎appveyor.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ for:
4848
configuration: Release
4949
- platform: x64
5050
configuration: Release
51+
- platform: arm64
52+
configuration: Release
5153

5254
artifacts:
5355
- path: 'sakura-*$(platform)-$(configuration)*.zip*'

‎build-all.bat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if "%platform%" == "Win32" (
66
@rem OK
77
) else if "%platform%" == "x64" (
88
@rem OK
9+
) else if "%platform%" == "arm64" (
10+
@rem OK
911
) else if "%platform%" == "MinGW" (
1012
@rem OK
1113
) else (
@@ -64,14 +66,16 @@ exit /b 0
6466
@echo %~nx1 platform configuration
6567
@echo.
6668
@echo parameter
67-
@echo platform : Win32 or x64 or MinGW
69+
@echo platform : Win32 or x64 arm64 or MinGW
6870
@echo configuration : Release or Debug
6971
@echo.
7072
@echo example
7173
@echo %~nx1 Win32 Release
7274
@echo %~nx1 Win32 Debug
7375
@echo %~nx1 x64 Release
7476
@echo %~nx1 x64 Debug
77+
@echo %~nx1 arm64 Release
78+
@echo %~nx1 arm64 Debug
7579
@echo %~nx1 MinGW Release
7680
@echo %~nx1 MinGW Debug
7781
exit /b 0

‎build-installer.bat‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ if "%platform%" == "Win32" (
77
@rem OK
88
) else if "%platform%" == "x64" (
99
@rem OK
10+
) else if "%platform%" == "arm64" (
11+
@rem OK
1012
) else (
1113
call :showhelp %0
1214
exit /b 1
@@ -47,13 +49,19 @@ set BRON_ZIP=installer\externals\bregonig\bron420.zip
4749
7z e %BRON_ZIP% -o%INSTALLER_RESOURCES_BRON% -y *.txt
4850
if "%platform%" == "x64" (
4951
7z e %BRON_ZIP% -o%platform%\%configuration% -y x64/%BREGONIG_DLL%
52+
) else if "%platform%" == "arm6464" (
53+
@rem provisional
54+
7z e %BRON_ZIP% -o%platform%\%configuration% -y x64/%BREGONIG_DLL%
5055
) else (
5156
7z e %BRON_ZIP% -o%platform%\%configuration% -y %BREGONIG_DLL%
5257
)
5358

5459
set CTAGS_EXE=ctags.exe
5560
if "%PLATFORM%" == "x64" (
5661
set CTAGS_PREFIX=x64
62+
) else if "%PLATFORM%" == "arm64" (
63+
@rem provisional
64+
set CTAGS_PREFIX=x64
5765
) else if "%PLATFORM%" == "Win32" (
5866
set CTAGS_PREFIX=x86
5967
)
@@ -91,12 +99,14 @@ exit /b 0
9199
@echo %~nx1 platform configuration
92100
@echo.
93101
@echo parameter
94-
@echo platform : Win32 or x64
102+
@echo platform : Win32 or x64 or arm64
95103
@echo configuration : Release or Debug
96104
@echo.
97105
@echo example
98106
@echo %~nx1 Win32 Release
99107
@echo %~nx1 Win32 Debug
100108
@echo %~nx1 x64 Release
101109
@echo %~nx1 x64 Debug
110+
@echo %~nx1 arm64 Release
111+
@echo %~nx1 arm64 Debug
102112
exit /b 0

‎build-sln.bat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ if "%platform%" == "Win32" (
66
@rem OK
77
) else if "%platform%" == "x64" (
88
@rem OK
9+
) else if "%platform%" == "arm64" (
10+
@rem OK
911
) else (
1012
call :showhelp %0
1113
exit /b 1
@@ -81,12 +83,14 @@ exit /b 0
8183
@echo %~nx1 platform configuration
8284
@echo.
8385
@echo parameter
84-
@echo platform : Win32 or x64
86+
@echo platform : Win32 or x64 or arm64
8587
@echo configuration : Release or Debug
8688
@echo.
8789
@echo example
8890
@echo %~nx1 Win32 Release
8991
@echo %~nx1 Win32 Debug
9092
@echo %~nx1 x64 Release
9193
@echo %~nx1 x64 Debug
94+
@echo %~nx1 arm64 Release
95+
@echo %~nx1 arm64 Debug
9296
exit /b 0

‎build.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ build-sln.bat Win32 Release
150150
build-sln.bat Win32 Debug
151151
build-sln.bat x64 Release
152152
build-sln.bat x64 Debug
153+
build-sln.bat arm64 Release
154+
build-sln.bat arm64 Debug
153155
```
154156

155157

@@ -175,6 +177,8 @@ build-sln.bat Win32 Release
175177
build-sln.bat Win32 Debug
176178
build-sln.bat x64 Release
177179
build-sln.bat x64 Debug
180+
build-sln.bat arm64 Release
181+
build-sln.bat arm64 Debug
178182
```
179183

180184
### CI でのビルドをスキップする方法

‎installer/sakura-arm64.iss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#define MyArchitecture "arm64"
2+
#define OutputSuffix "arm64"
3+
#include "sakura-common.iss"

‎run-cppcheck.bat‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ if "%platform%" == "Win32" (
77
@rem OK
88
) else if "%platform%" == "x64" (
99
@rem OK
10+
) else if "%platform%" == "arm64" (
11+
@rem OK
1012
) else (
1113
call :showhelp %0
1214
exit /b 1
@@ -35,6 +37,8 @@ if "%PLATFORM%" == "Win32" (
3537
set CPPCHECK_PLATFORM=win32W
3638
) else if "%PLATFORM%" == "x64" (
3739
set CPPCHECK_PLATFORM=win64
40+
) else if "%PLATFORM%" == "arm64" (
41+
set CPPCHECK_PLATFORM=win64
3842
) else (
3943
@echo not supported platform
4044
exit /b 1
@@ -78,12 +82,14 @@ exit /b %ERROR_RESULT%
7882
@echo %~nx1 platform configuration
7983
@echo.
8084
@echo parameter
81-
@echo platform : Win32 or x64
85+
@echo platform : Win32 or x64 or arm64
8286
@echo configuration : Release or Debug
8387
@echo.
8488
@echo example
8589
@echo %~nx1 Win32 Release
8690
@echo %~nx1 Win32 Debug
8791
@echo %~nx1 x64 Release
8892
@echo %~nx1 x64 Debug
93+
@echo %~nx1 arm64 Release
94+
@echo %~nx1 arm64 Debug
8995
exit /b 0

‎sakura.sln‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,60 @@ Global
1414
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1515
Debug|Win32 = Debug|Win32
1616
Debug|x64 = Debug|x64
17+
Debug|ARM64 = Debug|ARM64
1718
Release|Win32 = Release|Win32
1819
Release|x64 = Release|x64
20+
Release|ARM64 = Release|ARM64
1921
EndGlobalSection
2022
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2123
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.ActiveCfg = Debug|Win32
2224
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.Build.0 = Debug|Win32
2325
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.ActiveCfg = Debug|x64
2426
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.Build.0 = Debug|x64
27+
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|ARM64.ActiveCfg = Debug|ARM64
28+
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|ARM64.Build.0 = Debug|ARM64
2529
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.ActiveCfg = Release|Win32
2630
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.Build.0 = Release|Win32
2731
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.ActiveCfg = Release|x64
2832
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.Build.0 = Release|x64
33+
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|ARM64.ActiveCfg = Release|ARM64
34+
{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|ARM64.Build.0 = Release|ARM64
2935
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.ActiveCfg = Debug|Win32
3036
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.Build.0 = Debug|Win32
3137
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.ActiveCfg = Debug|Win32
3238
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.Build.0 = Debug|Win32
39+
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|ARM64.ActiveCfg = Debug|ARM64
40+
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|ARM64.Build.0 = Debug|ARM64
3341
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.ActiveCfg = Release|Win32
3442
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.Build.0 = Release|Win32
3543
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.ActiveCfg = Release|Win32
3644
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.Build.0 = Release|Win32
45+
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|ARM64.ActiveCfg = Release|ARM64
46+
{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|ARM64.Build.0 = Release|ARM64
3747
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.ActiveCfg = Debug|Win32
3848
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.Build.0 = Debug|Win32
3949
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.ActiveCfg = Debug|x64
4050
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.Build.0 = Debug|x64
51+
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|ARM64.ActiveCfg = Debug|ARM64
52+
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|ARM64.Build.0 = Debug|ARM64
4153
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.ActiveCfg = Release|Win32
4254
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.Build.0 = Release|Win32
4355
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.ActiveCfg = Release|x64
4456
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.Build.0 = Release|x64
57+
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|ARM64.ActiveCfg = Release|ARM64
58+
{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|ARM64.Build.0 = Release|ARM64
4559
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|Win32.ActiveCfg = Debug|Win32
4660
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|Win32.Build.0 = Debug|Win32
4761
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|x64.ActiveCfg = Debug|x64
4862
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|x64.Build.0 = Debug|x64
63+
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|ARM64.ActiveCfg = Debug|ARM64
64+
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Debug|ARM64.Build.0 = Debug|ARM64
4965
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|Win32.ActiveCfg = Release|Win32
5066
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|Win32.Build.0 = Release|Win32
5167
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|x64.ActiveCfg = Release|x64
5268
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|x64.Build.0 = Release|x64
69+
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|ARM64.ActiveCfg = Release|ARM64
70+
{701E3407-EC27-49F7-ADC7-520CF2B4B438}.Release|ARM64.Build.0 = Release|ARM64
5371
EndGlobalSection
5472
GlobalSection(SolutionProperties) = preSolution
5573
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)