Skip to content

Commit 4f50fe8

Browse files
xengine-qytxengine-qyt
committed
modify:vs arm64 build support
1 parent c1906f0 commit 4f50fe8

File tree

17 files changed

+854
-45
lines changed

17 files changed

+854
-45
lines changed

‎XEngine_Source/AuthorizeModule_CDKey/AuthorizeModule_CDKey.vcxproj‎

Lines changed: 79 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|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>
@@ -45,13 +53,26 @@
4553
<PlatformToolset>v143</PlatformToolset>
4654
<CharacterSet>Unicode</CharacterSet>
4755
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
57+
<ConfigurationType>DynamicLibrary</ConfigurationType>
58+
<UseDebugLibraries>true</UseDebugLibraries>
59+
<PlatformToolset>v143</PlatformToolset>
60+
<CharacterSet>Unicode</CharacterSet>
61+
</PropertyGroup>
4862
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4963
<ConfigurationType>DynamicLibrary</ConfigurationType>
5064
<UseDebugLibraries>false</UseDebugLibraries>
5165
<PlatformToolset>v143</PlatformToolset>
5266
<WholeProgramOptimization>true</WholeProgramOptimization>
5367
<CharacterSet>Unicode</CharacterSet>
5468
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
70+
<ConfigurationType>DynamicLibrary</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v143</PlatformToolset>
73+
<WholeProgramOptimization>true</WholeProgramOptimization>
74+
<CharacterSet>Unicode</CharacterSet>
75+
</PropertyGroup>
5576
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5677
<ImportGroup Label="ExtensionSettings">
5778
</ImportGroup>
@@ -66,9 +87,15 @@
6687
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6788
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6889
</ImportGroup>
90+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
91+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
92+
</ImportGroup>
6993
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7094
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7195
</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>
7299
<PropertyGroup Label="UserMacros" />
73100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74101
<IncludePath>$(XEngine_Include);..\AuthorizeModule_CDKey;$(IncludePath)</IncludePath>
@@ -78,6 +105,10 @@
78105
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
79106
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
80107
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
109+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
110+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
111+
</PropertyGroup>
81112
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
82113
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
83114
<LibraryPath>$(XEngine_Lib32);$(LibraryPath)</LibraryPath>
@@ -86,6 +117,10 @@
86117
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
87118
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
88119
</PropertyGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
121+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
122+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
123+
</PropertyGroup>
89124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90125
<ClCompile>
91126
<WarningLevel>Level3</WarningLevel>
@@ -146,6 +181,24 @@
146181
<ModuleDefinitionFile>AuthorizeModule_CDKey.def</ModuleDefinitionFile>
147182
</Link>
148183
</ItemDefinitionGroup>
184+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
185+
<ClCompile>
186+
<WarningLevel>Level3</WarningLevel>
187+
<SDLCheck>true</SDLCheck>
188+
<PreprocessorDefinitions>_DEBUG;AUTHORIZEMODULECDKEY_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189+
<ConformanceMode>true</ConformanceMode>
190+
<PrecompiledHeader>Use</PrecompiledHeader>
191+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
192+
<LanguageStandard>stdcpp20</LanguageStandard>
193+
<LanguageStandard_C>stdc17</LanguageStandard_C>
194+
</ClCompile>
195+
<Link>
196+
<SubSystem>Windows</SubSystem>
197+
<GenerateDebugInformation>true</GenerateDebugInformation>
198+
<EnableUAC>false</EnableUAC>
199+
<ModuleDefinitionFile>AuthorizeModule_CDKey.def</ModuleDefinitionFile>
200+
</Link>
201+
</ItemDefinitionGroup>
149202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150203
<ClCompile>
151204
<WarningLevel>Level3</WarningLevel>
@@ -170,6 +223,30 @@
170223
<ModuleDefinitionFile>AuthorizeModule_CDKey.def</ModuleDefinitionFile>
171224
</Link>
172225
</ItemDefinitionGroup>
226+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
227+
<ClCompile>
228+
<WarningLevel>Level3</WarningLevel>
229+
<FunctionLevelLinking>true</FunctionLevelLinking>
230+
<IntrinsicFunctions>true</IntrinsicFunctions>
231+
<SDLCheck>true</SDLCheck>
232+
<PreprocessorDefinitions>NDEBUG;AUTHORIZEMODULECDKEY_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
233+
<ConformanceMode>true</ConformanceMode>
234+
<PrecompiledHeader>Use</PrecompiledHeader>
235+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
236+
<LanguageStandard>stdcpp20</LanguageStandard>
237+
<LanguageStandard_C>stdc17</LanguageStandard_C>
238+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
239+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
240+
</ClCompile>
241+
<Link>
242+
<SubSystem>Windows</SubSystem>
243+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
244+
<OptimizeReferences>true</OptimizeReferences>
245+
<GenerateDebugInformation>true</GenerateDebugInformation>
246+
<EnableUAC>false</EnableUAC>
247+
<ModuleDefinitionFile>AuthorizeModule_CDKey.def</ModuleDefinitionFile>
248+
</Link>
249+
</ItemDefinitionGroup>
173250
<ItemGroup>
174251
<ClInclude Include="Authorize_CDKey\Authorize_CDKey.h" />
175252
<ClInclude Include="Authorize_Serial\Authorize_Serial.h" />
@@ -185,8 +262,10 @@
185262
<ClCompile Include="pch.cpp">
186263
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
187264
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
265+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
188266
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
189267
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
268+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
190269
</ClCompile>
191270
</ItemGroup>
192271
<ItemGroup>

‎XEngine_Source/AuthorizeModule_Client/AuthorizeModule_Client.vcxproj‎

Lines changed: 79 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|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>
@@ -45,13 +53,26 @@
4553
<PlatformToolset>v143</PlatformToolset>
4654
<CharacterSet>Unicode</CharacterSet>
4755
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
57+
<ConfigurationType>DynamicLibrary</ConfigurationType>
58+
<UseDebugLibraries>true</UseDebugLibraries>
59+
<PlatformToolset>v143</PlatformToolset>
60+
<CharacterSet>Unicode</CharacterSet>
61+
</PropertyGroup>
4862
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4963
<ConfigurationType>DynamicLibrary</ConfigurationType>
5064
<UseDebugLibraries>false</UseDebugLibraries>
5165
<PlatformToolset>v143</PlatformToolset>
5266
<WholeProgramOptimization>true</WholeProgramOptimization>
5367
<CharacterSet>Unicode</CharacterSet>
5468
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
70+
<ConfigurationType>DynamicLibrary</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v143</PlatformToolset>
73+
<WholeProgramOptimization>true</WholeProgramOptimization>
74+
<CharacterSet>Unicode</CharacterSet>
75+
</PropertyGroup>
5576
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5677
<ImportGroup Label="ExtensionSettings">
5778
</ImportGroup>
@@ -66,9 +87,15 @@
6687
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6788
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6889
</ImportGroup>
90+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
91+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
92+
</ImportGroup>
6993
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7094
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7195
</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>
7299
<PropertyGroup Label="UserMacros" />
73100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
74101
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
@@ -82,10 +109,18 @@
82109
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
83110
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
84111
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
113+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
114+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
115+
</PropertyGroup>
85116
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
86117
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
87118
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
88119
</PropertyGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
121+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
122+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
123+
</PropertyGroup>
89124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90125
<ClCompile>
91126
<WarningLevel>Level3</WarningLevel>
@@ -146,6 +181,24 @@
146181
<ModuleDefinitionFile>AuthorizeModule_Client.def</ModuleDefinitionFile>
147182
</Link>
148183
</ItemDefinitionGroup>
184+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
185+
<ClCompile>
186+
<WarningLevel>Level3</WarningLevel>
187+
<SDLCheck>true</SDLCheck>
188+
<PreprocessorDefinitions>_DEBUG;AUTHORIZEMODULECLIENT_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189+
<ConformanceMode>true</ConformanceMode>
190+
<PrecompiledHeader>Use</PrecompiledHeader>
191+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
192+
<LanguageStandard>stdcpp20</LanguageStandard>
193+
<LanguageStandard_C>stdc17</LanguageStandard_C>
194+
</ClCompile>
195+
<Link>
196+
<SubSystem>Windows</SubSystem>
197+
<GenerateDebugInformation>true</GenerateDebugInformation>
198+
<EnableUAC>false</EnableUAC>
199+
<ModuleDefinitionFile>AuthorizeModule_Client.def</ModuleDefinitionFile>
200+
</Link>
201+
</ItemDefinitionGroup>
149202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150203
<ClCompile>
151204
<WarningLevel>Level3</WarningLevel>
@@ -170,6 +223,30 @@
170223
<ModuleDefinitionFile>AuthorizeModule_Client.def</ModuleDefinitionFile>
171224
</Link>
172225
</ItemDefinitionGroup>
226+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
227+
<ClCompile>
228+
<WarningLevel>Level3</WarningLevel>
229+
<FunctionLevelLinking>true</FunctionLevelLinking>
230+
<IntrinsicFunctions>true</IntrinsicFunctions>
231+
<SDLCheck>true</SDLCheck>
232+
<PreprocessorDefinitions>NDEBUG;AUTHORIZEMODULECLIENT_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
233+
<ConformanceMode>true</ConformanceMode>
234+
<PrecompiledHeader>Use</PrecompiledHeader>
235+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
236+
<LanguageStandard>stdcpp20</LanguageStandard>
237+
<LanguageStandard_C>stdc17</LanguageStandard_C>
238+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
239+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
240+
</ClCompile>
241+
<Link>
242+
<SubSystem>Windows</SubSystem>
243+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
244+
<OptimizeReferences>true</OptimizeReferences>
245+
<GenerateDebugInformation>true</GenerateDebugInformation>
246+
<EnableUAC>false</EnableUAC>
247+
<ModuleDefinitionFile>AuthorizeModule_Client.def</ModuleDefinitionFile>
248+
</Link>
249+
</ItemDefinitionGroup>
173250
<ItemGroup>
174251
<ClInclude Include="AuthClient_Connector\AuthClient_Connector.h" />
175252
<ClInclude Include="AuthClient_Define.h" />
@@ -186,7 +263,9 @@
186263
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
187264
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
188265
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
266+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
189267
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
268+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
190269
</ClCompile>
191270
</ItemGroup>
192271
<ItemGroup>

‎XEngine_Source/AuthorizeModule_Client/pch.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,26 @@ using namespace std;
5555
extern bool AuthClient_IsErrorOccur;
5656
extern XLONG AuthClient_dwErrorCode;
5757

58-
5958
#ifdef _MSC_BUILD
6059
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6160
#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
6261
#pragma comment(lib,"XEngine_Client/XClient_Socket")
6362
#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
6463
#pragma comment(lib,"XEngine_SystemSdk/XEngine_SystemApi")
6564
#ifdef _DEBUG
66-
#ifdef _WIN64
65+
#ifdef _M_X64
6766
#pragma comment(lib,"../x64/Debug/jsoncpp")
68-
#else
67+
#elif _M_ARM64
68+
#pragma comment(lib,"../ARM64/Debug/jsoncpp")
69+
#elif _M_IX86
6970
#pragma comment(lib,"../Debug/jsoncpp")
7071
#endif
7172
#else
72-
#ifdef _WIN64
73+
#ifdef _M_X64
7374
#pragma comment(lib,"../x64/Release/jsoncpp")
74-
#else
75+
#elif _M_ARM64
76+
#pragma comment(lib,"../ARM64/Release/jsoncpp")
77+
#elif _M_IX86
7578
#pragma comment(lib,"../Release/jsoncpp")
7679
#endif
7780
#endif

0 commit comments

Comments
 (0)