Skip to content

Commit 459ba5b

Browse files
yaukeywangyaukeywang
committed
Merge branch 'x86_64-arm64'
2 parents 8f6d93d + f8137fe commit 459ba5b

File tree

3 files changed

+134
-1
lines changed

3 files changed

+134
-1
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
/Build/
44

55
/vs2015-android/ARM/
6+
/vs2015-android/ARM64/
67
/vs2015-android/x86/
8+
/vs2015-android/x64/
79

810
/vs2015-windows/Debug/
911
/vs2015-windows/Release/

‎vs2015-android/vs2015-android.sln‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22823.1
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2015-android", "vs2015-android.vcxproj", "{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|ARM = Debug|ARM
11+
Debug|ARM64 = Debug|ARM64
12+
Debug|x64 = Debug|x64
1113
Debug|x86 = Debug|x86
1214
Release|ARM = Release|ARM
15+
Release|ARM64 = Release|ARM64
16+
Release|x64 = Release|x64
1317
Release|x86 = Release|x86
1418
EndGlobalSection
1519
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1620
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|ARM.ActiveCfg = Debug|ARM
1721
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|ARM.Build.0 = Debug|ARM
22+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
23+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|ARM64.Build.0 = Debug|ARM64
24+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|x64.ActiveCfg = Debug|x64
25+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|x64.Build.0 = Debug|x64
1826
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|x86.ActiveCfg = Debug|x86
1927
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Debug|x86.Build.0 = Debug|x86
2028
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|ARM.ActiveCfg = Release|ARM
2129
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|ARM.Build.0 = Release|ARM
30+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|ARM64.ActiveCfg = Release|ARM64
31+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|ARM64.Build.0 = Release|ARM64
32+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|x64.ActiveCfg = Release|x64
33+
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|x64.Build.0 = Release|x64
2234
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|x86.ActiveCfg = Release|x86
2335
{B5A8E2AE-60D0-475E-A501-AABAE04B5B6E}.Release|x86.Build.0 = Release|x86
2436
EndGlobalSection

‎vs2015-android/vs2015-android.vcxproj‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<Configuration>Debug</Configuration>
66
<Platform>ARM</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
816
<ProjectConfiguration Include="Debug|x86">
917
<Configuration>Debug</Configuration>
1018
<Platform>x86</Platform>
@@ -13,6 +21,14 @@
1321
<Configuration>Release</Configuration>
1422
<Platform>ARM</Platform>
1523
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|ARM64">
25+
<Configuration>Release</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Release|x64">
29+
<Configuration>Release</Configuration>
30+
<Platform>x64</Platform>
31+
</ProjectConfiguration>
1632
<ProjectConfiguration Include="Release|x86">
1733
<Configuration>Release</Configuration>
1834
<Platform>x86</Platform>
@@ -55,15 +71,23 @@
5571
<ClCompile Include="..\lua-src\lua-5.3.2\src\ltm.c" />
5672
<ClCompile Include="..\lua-src\lua-5.3.2\src\lua.c">
5773
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
74+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
5875
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
76+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
5977
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">true</ExcludedFromBuild>
78+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
6079
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x86'">true</ExcludedFromBuild>
80+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
6181
</ClCompile>
6282
<ClCompile Include="..\lua-src\lua-5.3.2\src\luac.c">
6383
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
84+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
6485
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
86+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
6587
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">true</ExcludedFromBuild>
88+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
6689
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x86'">true</ExcludedFromBuild>
90+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
6791
</ClCompile>
6892
<ClCompile Include="..\lua-src\lua-5.3.2\src\lundump.c" />
6993
<ClCompile Include="..\lua-src\lua-5.3.2\src\lutf8lib.c" />
@@ -122,24 +146,48 @@
122146
<PlatformToolset>Clang_3_6</PlatformToolset>
123147
<AndroidAPILevel>android-18</AndroidAPILevel>
124148
</PropertyGroup>
149+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
150+
<ConfigurationType>DynamicLibrary</ConfigurationType>
151+
<UseDebugLibraries>true</UseDebugLibraries>
152+
<PlatformToolset>Clang_3_6</PlatformToolset>
153+
<AndroidAPILevel>android-21</AndroidAPILevel>
154+
</PropertyGroup>
125155
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
126156
<ConfigurationType>DynamicLibrary</ConfigurationType>
127157
<UseDebugLibraries>true</UseDebugLibraries>
128158
<PlatformToolset>Clang_3_6</PlatformToolset>
129159
<AndroidAPILevel>android-18</AndroidAPILevel>
130160
</PropertyGroup>
161+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
162+
<ConfigurationType>DynamicLibrary</ConfigurationType>
163+
<UseDebugLibraries>true</UseDebugLibraries>
164+
<PlatformToolset>Clang_3_6</PlatformToolset>
165+
<AndroidAPILevel>android-21</AndroidAPILevel>
166+
</PropertyGroup>
131167
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
132168
<ConfigurationType>DynamicLibrary</ConfigurationType>
133169
<UseDebugLibraries>false</UseDebugLibraries>
134170
<PlatformToolset>Clang_3_6</PlatformToolset>
135171
<AndroidAPILevel>android-18</AndroidAPILevel>
136172
</PropertyGroup>
173+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
174+
<ConfigurationType>DynamicLibrary</ConfigurationType>
175+
<UseDebugLibraries>false</UseDebugLibraries>
176+
<PlatformToolset>Clang_3_6</PlatformToolset>
177+
<AndroidAPILevel>android-21</AndroidAPILevel>
178+
</PropertyGroup>
137179
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
138180
<ConfigurationType>DynamicLibrary</ConfigurationType>
139181
<UseDebugLibraries>false</UseDebugLibraries>
140182
<PlatformToolset>Clang_3_6</PlatformToolset>
141183
<AndroidAPILevel>android-18</AndroidAPILevel>
142184
</PropertyGroup>
185+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
186+
<ConfigurationType>DynamicLibrary</ConfigurationType>
187+
<UseDebugLibraries>false</UseDebugLibraries>
188+
<PlatformToolset>Clang_3_6</PlatformToolset>
189+
<AndroidAPILevel>android-21</AndroidAPILevel>
190+
</PropertyGroup>
143191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
144192
<ImportGroup Label="ExtensionSettings" />
145193
<ImportGroup Label="Shared" />
@@ -149,18 +197,34 @@
149197
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
150198
<TargetName>libslua</TargetName>
151199
</PropertyGroup>
200+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
201+
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
202+
<TargetName>libslua</TargetName>
203+
</PropertyGroup>
152204
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
153205
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
154206
<TargetName>libslua</TargetName>
155207
</PropertyGroup>
208+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
209+
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
210+
<TargetName>libslua</TargetName>
211+
</PropertyGroup>
156212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
157213
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
158214
<TargetName>libslua</TargetName>
159215
</PropertyGroup>
216+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
217+
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
218+
<TargetName>libslua</TargetName>
219+
</PropertyGroup>
160220
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
161221
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
162222
<TargetName>libslua</TargetName>
163223
</PropertyGroup>
224+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
225+
<OutDir>$(SolutionDir)..\Build\Android\$(Platform)\$(Configuration)\</OutDir>
226+
<TargetName>libslua</TargetName>
227+
</PropertyGroup>
164228
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
165229
<ClCompile>
166230
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -174,6 +238,19 @@
174238
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
175239
</Link>
176240
</ItemDefinitionGroup>
241+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
242+
<ClCompile>
243+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
244+
<PrecompiledHeaderFile>
245+
</PrecompiledHeaderFile>
246+
<AdditionalIncludeDirectories>../lua-src/lua-5.3.2/src;../lua-src/slua-1.1.1;../lua-src/lpeg-1.0.0;../lua-src/sproto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
247+
<PreprocessorDefinitions>%(PreprocessorDefinitions);LPEG_DEBUG</PreprocessorDefinitions>
248+
<AdditionalOptions>-D "lua_getlocaledecpoint()=('.')" %(AdditionalOptions)</AdditionalOptions>
249+
</ClCompile>
250+
<Link>
251+
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
252+
</Link>
253+
</ItemDefinitionGroup>
177254
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
178255
<ClCompile>
179256
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -188,6 +265,20 @@
188265
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
189266
</Link>
190267
</ItemDefinitionGroup>
268+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
269+
<ClCompile>
270+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
271+
<PrecompiledHeaderFile>
272+
</PrecompiledHeaderFile>
273+
<AdditionalIncludeDirectories>../lua-src/lua-5.3.2/src;../lua-src/slua-1.1.1;../lua-src/lpeg-1.0.0;../lua-src/sproto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
274+
<PreprocessorDefinitions>%(PreprocessorDefinitions);LPEG_DEBUG</PreprocessorDefinitions>
275+
<AdditionalOptions>-D "lua_getlocaledecpoint()=('.')" %(AdditionalOptions)</AdditionalOptions>
276+
<CLanguageStandard>Default</CLanguageStandard>
277+
</ClCompile>
278+
<Link>
279+
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
280+
</Link>
281+
</ItemDefinitionGroup>
191282
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
192283
<ClCompile>
193284
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -202,6 +293,20 @@
202293
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
203294
</Link>
204295
</ItemDefinitionGroup>
296+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
297+
<ClCompile>
298+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
299+
<PrecompiledHeaderFile>
300+
</PrecompiledHeaderFile>
301+
<AdditionalIncludeDirectories>../lua-src/lua-5.3.2/src;../lua-src/slua-1.1.1;../lua-src/lpeg-1.0.0;../lua-src/sproto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
302+
<AdditionalOptions>-D "lua_getlocaledecpoint()=('.')" %(AdditionalOptions)</AdditionalOptions>
303+
<PreprocessorDefinitions>
304+
</PreprocessorDefinitions>
305+
</ClCompile>
306+
<Link>
307+
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
308+
</Link>
309+
</ItemDefinitionGroup>
205310
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
206311
<ClCompile>
207312
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -215,6 +320,20 @@
215320
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
216321
</Link>
217322
</ItemDefinitionGroup>
323+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
324+
<ClCompile>
325+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
326+
<PrecompiledHeaderFile>
327+
</PrecompiledHeaderFile>
328+
<AdditionalIncludeDirectories>../lua-src/lua-5.3.2/src;../lua-src/slua-1.1.1;../lua-src/lpeg-1.0.0;../lua-src/sproto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
329+
<PreprocessorDefinitions>
330+
</PreprocessorDefinitions>
331+
<AdditionalOptions>-D "lua_getlocaledecpoint()=('.')" %(AdditionalOptions)</AdditionalOptions>
332+
</ClCompile>
333+
<Link>
334+
<AdditionalOptions>-lm %(AdditionalOptions)</AdditionalOptions>
335+
</Link>
336+
</ItemDefinitionGroup>
218337
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
219338
<ImportGroup Label="ExtensionTargets" />
220339
</Project>

0 commit comments

Comments
 (0)