Skip to content

Commit a5b4a20

Browse files
xengine-qytxengine-qyt
committed
fixed:arm64 build error
1 parent 27e5e68 commit a5b4a20

File tree

15 files changed

+711
-66
lines changed

15 files changed

+711
-66
lines changed

‎XEngine_Source/XEngine.sln‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,88 +73,130 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_InfoReport", "XEngi
7373
EndProject
7474
Global
7575
GlobalSection(SolutionConfigurationPlatforms) = preSolution
76+
Debug|ARM64 = Debug|ARM64
7677
Debug|x64 = Debug|x64
7778
Debug|x86 = Debug|x86
79+
Release|ARM64 = Release|ARM64
7880
Release|x64 = Release|x64
7981
Release|x86 = Release|x86
8082
EndGlobalSection
8183
GlobalSection(ProjectConfigurationPlatforms) = postSolution
84+
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|ARM64.ActiveCfg = Debug|ARM64
85+
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|ARM64.Build.0 = Debug|ARM64
8286
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|x64.ActiveCfg = Debug|x64
8387
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|x64.Build.0 = Debug|x64
8488
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|x86.ActiveCfg = Debug|Win32
8589
{F54F152C-594F-4465-A44E-2DB915B39760}.Debug|x86.Build.0 = Debug|Win32
90+
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|ARM64.ActiveCfg = Release|ARM64
91+
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|ARM64.Build.0 = Release|ARM64
8692
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|x64.ActiveCfg = Release|x64
8793
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|x64.Build.0 = Release|x64
8894
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|x86.ActiveCfg = Release|Win32
8995
{F54F152C-594F-4465-A44E-2DB915B39760}.Release|x86.Build.0 = Release|Win32
96+
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|ARM64.ActiveCfg = Debug|ARM64
97+
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|ARM64.Build.0 = Debug|ARM64
9098
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|x64.ActiveCfg = Debug|x64
9199
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|x64.Build.0 = Debug|x64
92100
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|x86.ActiveCfg = Debug|Win32
93101
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Debug|x86.Build.0 = Debug|Win32
102+
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|ARM64.ActiveCfg = Release|ARM64
103+
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|ARM64.Build.0 = Release|ARM64
94104
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x64.ActiveCfg = Release|x64
95105
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x64.Build.0 = Release|x64
96106
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x86.ActiveCfg = Release|Win32
97107
{E756B7D2-D40D-4106-9C14-1D90F20A712E}.Release|x86.Build.0 = Release|Win32
108+
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|ARM64.ActiveCfg = Debug|ARM64
109+
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|ARM64.Build.0 = Debug|ARM64
98110
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|x64.ActiveCfg = Debug|x64
99111
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|x64.Build.0 = Debug|x64
100112
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|x86.ActiveCfg = Debug|Win32
101113
{20946145-EFE0-4B44-845C-031E487687ED}.Debug|x86.Build.0 = Debug|Win32
114+
{20946145-EFE0-4B44-845C-031E487687ED}.Release|ARM64.ActiveCfg = Release|ARM64
115+
{20946145-EFE0-4B44-845C-031E487687ED}.Release|ARM64.Build.0 = Release|ARM64
102116
{20946145-EFE0-4B44-845C-031E487687ED}.Release|x64.ActiveCfg = Release|x64
103117
{20946145-EFE0-4B44-845C-031E487687ED}.Release|x64.Build.0 = Release|x64
104118
{20946145-EFE0-4B44-845C-031E487687ED}.Release|x86.ActiveCfg = Release|Win32
105119
{20946145-EFE0-4B44-845C-031E487687ED}.Release|x86.Build.0 = Release|Win32
120+
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|ARM64.ActiveCfg = Debug|ARM64
121+
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|ARM64.Build.0 = Debug|ARM64
106122
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|x64.ActiveCfg = Debug|x64
107123
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|x64.Build.0 = Debug|x64
108124
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|x86.ActiveCfg = Debug|Win32
109125
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Debug|x86.Build.0 = Debug|Win32
126+
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|ARM64.ActiveCfg = Release|ARM64
127+
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|ARM64.Build.0 = Release|ARM64
110128
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|x64.ActiveCfg = Release|x64
111129
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|x64.Build.0 = Release|x64
112130
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|x86.ActiveCfg = Release|Win32
113131
{6C935BE1-77E3-4719-A7A6-C76ABAFEE010}.Release|x86.Build.0 = Release|Win32
132+
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|ARM64.ActiveCfg = Debug|ARM64
133+
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|ARM64.Build.0 = Debug|ARM64
114134
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x64.ActiveCfg = Debug|x64
115135
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x64.Build.0 = Debug|x64
116136
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x86.ActiveCfg = Debug|Win32
117137
{140AD4A9-4918-4345-B352-507C345AEBE0}.Debug|x86.Build.0 = Debug|Win32
138+
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|ARM64.ActiveCfg = Release|ARM64
139+
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|ARM64.Build.0 = Release|ARM64
118140
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|x64.ActiveCfg = Release|x64
119141
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|x64.Build.0 = Release|x64
120142
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|x86.ActiveCfg = Release|Win32
121143
{140AD4A9-4918-4345-B352-507C345AEBE0}.Release|x86.Build.0 = Release|Win32
144+
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|ARM64.ActiveCfg = Debug|ARM64
145+
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|ARM64.Build.0 = Debug|ARM64
122146
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|x64.ActiveCfg = Debug|x64
123147
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|x64.Build.0 = Debug|x64
124148
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|x86.ActiveCfg = Debug|Win32
125149
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Debug|x86.Build.0 = Debug|Win32
150+
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|ARM64.ActiveCfg = Release|ARM64
151+
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|ARM64.Build.0 = Release|ARM64
126152
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|x64.ActiveCfg = Release|x64
127153
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|x64.Build.0 = Release|x64
128154
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|x86.ActiveCfg = Release|Win32
129155
{9BA08383-9908-46C8-A6FE-803BAB0C8AA4}.Release|x86.Build.0 = Release|Win32
156+
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
157+
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|ARM64.Build.0 = Debug|ARM64
130158
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|x64.ActiveCfg = Debug|x64
131159
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|x64.Build.0 = Debug|x64
132160
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|x86.ActiveCfg = Debug|Win32
133161
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Debug|x86.Build.0 = Debug|Win32
162+
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|ARM64.ActiveCfg = Release|ARM64
163+
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|ARM64.Build.0 = Release|ARM64
134164
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|x64.ActiveCfg = Release|x64
135165
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|x64.Build.0 = Release|x64
136166
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|x86.ActiveCfg = Release|Win32
137167
{5F2B92CF-D65A-47A4-9774-4F57F0A8B60F}.Release|x86.Build.0 = Release|Win32
168+
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|ARM64.ActiveCfg = Debug|ARM64
169+
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|ARM64.Build.0 = Debug|ARM64
138170
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|x64.ActiveCfg = Debug|x64
139171
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|x64.Build.0 = Debug|x64
140172
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|x86.ActiveCfg = Debug|Win32
141173
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Debug|x86.Build.0 = Debug|Win32
174+
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|ARM64.ActiveCfg = Release|ARM64
175+
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|ARM64.Build.0 = Release|ARM64
142176
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|x64.ActiveCfg = Release|x64
143177
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|x64.Build.0 = Release|x64
144178
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|x86.ActiveCfg = Release|Win32
145179
{BB5EC7ED-F094-4065-BF7A-C1CC93967CE1}.Release|x86.Build.0 = Release|Win32
180+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|ARM64.ActiveCfg = Debug|ARM64
181+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|ARM64.Build.0 = Debug|ARM64
146182
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.ActiveCfg = Debug|x64
147183
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x64.Build.0 = Debug|x64
148184
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.ActiveCfg = Debug|Win32
149185
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Debug|x86.Build.0 = Debug|Win32
186+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|ARM64.ActiveCfg = Release|ARM64
187+
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|ARM64.Build.0 = Release|ARM64
150188
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.ActiveCfg = Release|x64
151189
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x64.Build.0 = Release|x64
152190
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.ActiveCfg = Release|Win32
153191
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB}.Release|x86.Build.0 = Release|Win32
192+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|ARM64.ActiveCfg = Debug|ARM64
193+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|ARM64.Build.0 = Debug|ARM64
154194
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.ActiveCfg = Debug|x64
155195
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x64.Build.0 = Debug|x64
156196
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.ActiveCfg = Debug|Win32
157197
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Debug|x86.Build.0 = Debug|Win32
198+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|ARM64.ActiveCfg = Release|ARM64
199+
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|ARM64.Build.0 = Release|ARM64
158200
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.ActiveCfg = Release|x64
159201
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x64.Build.0 = Release|x64
160202
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89}.Release|x86.ActiveCfg = Release|Win32

‎XEngine_Source/XEngine_ModuleConfigure/XEngine_ModuleConfigure.vcxproj‎

Lines changed: 78 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
<LinkIncremental>true</LinkIncremental>
@@ -84,11 +111,20 @@
84111
<LinkIncremental>true</LinkIncremental>
85112
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
86113
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
115+
<LinkIncremental>true</LinkIncremental>
116+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
117+
</PropertyGroup>
87118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
88119
<LinkIncremental>false</LinkIncremental>
89120
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
90121
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
91122
</PropertyGroup>
123+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
124+
<LinkIncremental>false</LinkIncremental>
125+
<IncludePath>$(XEngine_Include);../XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
126+
<LibraryPath>$(XEngine_LibArm64);$(LibraryPath)</LibraryPath>
127+
</PropertyGroup>
92128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
93129
<ClCompile>
94130
<WarningLevel>Level3</WarningLevel>
@@ -146,6 +182,23 @@
146182
<ModuleDefinitionFile>XEngine_ModuleConfigure.def</ModuleDefinitionFile>
147183
</Link>
148184
</ItemDefinitionGroup>
185+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
186+
<ClCompile>
187+
<WarningLevel>Level3</WarningLevel>
188+
<SDLCheck>true</SDLCheck>
189+
<PreprocessorDefinitions>_DEBUG;XENGINEMODULECONFIGURE_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
190+
<ConformanceMode>true</ConformanceMode>
191+
<PrecompiledHeader>Use</PrecompiledHeader>
192+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
193+
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
194+
</ClCompile>
195+
<Link>
196+
<SubSystem>Windows</SubSystem>
197+
<GenerateDebugInformation>true</GenerateDebugInformation>
198+
<EnableUAC>false</EnableUAC>
199+
<ModuleDefinitionFile>XEngine_ModuleConfigure.def</ModuleDefinitionFile>
200+
</Link>
201+
</ItemDefinitionGroup>
149202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
150203
<ClCompile>
151204
<WarningLevel>Level3</WarningLevel>
@@ -169,6 +222,29 @@
169222
<ModuleDefinitionFile>XEngine_ModuleConfigure.def</ModuleDefinitionFile>
170223
</Link>
171224
</ItemDefinitionGroup>
225+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
226+
<ClCompile>
227+
<WarningLevel>Level3</WarningLevel>
228+
<FunctionLevelLinking>true</FunctionLevelLinking>
229+
<IntrinsicFunctions>true</IntrinsicFunctions>
230+
<SDLCheck>true</SDLCheck>
231+
<PreprocessorDefinitions>NDEBUG;XENGINEMODULECONFIGURE_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
232+
<ConformanceMode>true</ConformanceMode>
233+
<PrecompiledHeader>Use</PrecompiledHeader>
234+
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
235+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
236+
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
237+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
238+
</ClCompile>
239+
<Link>
240+
<SubSystem>Windows</SubSystem>
241+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
242+
<OptimizeReferences>true</OptimizeReferences>
243+
<GenerateDebugInformation>true</GenerateDebugInformation>
244+
<EnableUAC>false</EnableUAC>
245+
<ModuleDefinitionFile>XEngine_ModuleConfigure.def</ModuleDefinitionFile>
246+
</Link>
247+
</ItemDefinitionGroup>
172248
<ItemGroup>
173249
<ClInclude Include="framework.h" />
174250
<ClInclude Include="ModuleConfigure_Json\ModuleConfigure_Json.h" />
@@ -182,8 +258,10 @@
182258
<ClCompile Include="pch.cpp">
183259
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
184260
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
261+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
185262
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
186263
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
264+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
187265
</ClCompile>
188266
</ItemGroup>
189267
<ItemGroup>

‎XEngine_Source/XEngine_ModuleConfigure/pch.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,19 @@ extern XLONG Config_dwErrorCode;
4040

4141
#ifdef _MSC_BUILD
4242
#ifdef _DEBUG
43-
#ifdef _WIN64
43+
#ifdef _M_X64
4444
#pragma comment(lib,"../x64/Debug/jsoncpp")
45-
#else
45+
#elif _M_ARM64
46+
#pragma comment(lib,"../ARM64/Debug/jsoncpp")
47+
#elif _M_IX86
4648
#pragma comment(lib,"../Debug/jsoncpp")
4749
#endif
4850
#else
49-
#ifdef _WIN64
51+
#ifdef _M_X64
5052
#pragma comment(lib,"../x64/Release/jsoncpp")
51-
#else
53+
#elif _M_ARM64
54+
#pragma comment(lib,"../ARM64/Release/jsoncpp")
55+
#elif _M_IX86
5256
#pragma comment(lib,"../Release/jsoncpp")
5357
#endif
5458
#endif

0 commit comments

Comments
 (0)