Skip to content

Commit 80a7752

Browse files
MikeHolmanMikeHolman
committed
Merge remote-tracking branch 'origin/master' into enum_comparison
2 parents b2c44ae + e6c88ea commit 80a7752

3,007 files changed

Lines changed: 250764 additions & 214961 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,24 @@
2727
*.vcxproj.user
2828
*.vspscc
2929
*.wrn
30+
.vs/
3031

3132
# Visual Studio Extensions
3233
*.vadbg
34+
*.args.json
3335

3436
# Build Artifacts
3537
build_*.err
3638
build_*.log
3739
build_*.wrn
38-
Build/.vs/
3940
Build/ipch/
4041
Build/swum-cache.txt
4142
Build/VCBuild.NoJIT/
43+
Build/VCBuild.SWB/
4244
Build/VCBuild/
4345
buildchk.*
4446
buildfre.*
45-
BuildLinux/
47+
out/
4648
_DROP/
4749

4850
# Generated Files
@@ -76,6 +78,7 @@ install_manifest.txt
7678
# VIM
7779
.*.swo
7880
.*.swp
81+
tags
7982

8083
# VS Code
8184
.vscode/
@@ -84,11 +87,21 @@ install_manifest.txt
8487
*.a
8588
*.gch
8689
*.o
90+
*.so
91+
*.dylib
8792
Makefile
8893
pal/src/config.h
94+
DbgController.js.h
8995

9096
# Generated by other tools
97+
*.lldb.cmd
9198
*.orig
9299
deps/
93100

94101
.DS_Store
102+
android-toolchain-arm/
103+
cc-toolchain/
104+
/TraceOutput.txt
105+
Build/VcBuild
106+
Build/VcBuild.NoJIT
107+
Build/VcBuild.SWB

‎Build/CMakeFeatureDetect.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
include(CheckCXXSourceCompiles)
77
include(CheckCXXSourceRuns)
88

9-
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
9+
if(CC_TARGET_OS_OSX)
1010
# by default this is disabled for osx
1111
# enable temporarily
1212
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
@@ -33,7 +33,7 @@ else()
3333
set(CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS "-fno-optimize-sibling-calls")
3434
endif()
3535

36-
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
36+
if(CC_TARGET_OS_OSX)
3737
# by default this is disabled for osx
3838
# disable back
3939
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \

‎Build/Chakra.Build.Default.props‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="Common.Build.Default.props"/>
44
<Import Condition="'$(Clang)'!=''" Project="Chakra.Build.Clang.Default.props"/>
5+
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
6+
<!-- Default the installed latest Win10 SDK -->
7+
<WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
8+
<WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
9+
<WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
10+
<WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
11+
<!-- Sometimes the version in the registry has to .0 suffix, and sometimes it doesn't. Check and add it -->
12+
<WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' != '' and !$(WindowsTargetPlatformVersion_10.EndsWith('.0'))">$(WindowsTargetPlatformVersion_10).0</WindowsTargetPlatformVersion_10>
13+
14+
<WindowsTargetPlatformVersion>$(WindowsTargetPlatformVersion_10)</WindowsTargetPlatformVersion>
15+
16+
<!-- Default back to 10.0.10240.0 if the ARM version of the Win10 SDK is not installed -->
17+
<WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' and !Exists('$(WindowsSdkInstallFolder_10)\Include\$(WindowsTargetPlatformVersion_10)\shared\ksarm.h')">10.0.10240.0</WindowsTargetPlatformVersion>
18+
</PropertyGroup>
519
<PropertyGroup>
6-
<WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM'">10.0.10240.0</WindowsTargetPlatformVersion>
7-
8-
<!-- Always use Platform SDK for core builds -->
9-
<EventManifestXmlPath>$(WindowsSDK80Path)Include\um</EventManifestXmlPath>
1020
<!-- Unless indicated otherwise, statically link the C++ Runtime into ChakraCore.dll -->
1121
<RuntimeLib Condition="'$(RuntimeLib)'==''">static_library</RuntimeLib>
1222

‎Build/Chakra.Build.Paths.props‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<BuildConfigPropsPath>$(MSBuildThisFileDirectory)</BuildConfigPropsPath>
99

1010
<ChakraBuildPathImported>true</ChakraBuildPathImported>
11-
11+
</PropertyGroup>
12+
<PropertyGroup Label="ICU">
13+
<!-- IcuLibDir can be set in environment or with "/p:IcuLibDir=..." -->
14+
<IcuLibDir Condition="'$(IcuLibDir)'=='' AND '$(Configuration)'=='Debug'">$(ChakraCoreRootDirectory)\deps\static\icu-small\debug</IcuLibDir>
15+
<IcuLibDir Condition="'$(IcuLibDir)'=='' AND ('$(Configuration)'=='Test' or '$(Configuration)'=='Release')">$(ChakraCoreRootDirectory)\deps\static\icu-small\release</IcuLibDir>
16+
<!-- IcuIncludeDir can be set in environment or with "/p:IcuIncludeDir=..." -->
17+
<IcuIncludeDir Condition="'$(IcuIncludeDir)'==''">$(ChakraCoreRootDirectory)\deps\icu-small\source</IcuIncludeDir>
1218
</PropertyGroup>
1319
</Project>

‎Build/Chakra.Build.props‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
<PropertyGroup>
55
<Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win7)'">0x0601</Win32_WinNTVersion>
66
<Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win8)'">0x0602</Win32_WinNTVersion>
7+
<Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_WinBlue)'">0x0603</Win32_WinNTVersion>
78
<Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win10)'">0x0A00</Win32_WinNTVersion>
9+
10+
<!-- Always use Platform SDK for core builds -->
11+
<EventManifestXmlPath Condition="'$(TargetPlatformVersion)'=='8.1'">$(WindowsSdkDir)Include\um</EventManifestXmlPath>
12+
<EventManifestXmlPath Condition="'$(TargetPlatformVersion)'!='8.1'">$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um</EventManifestXmlPath>
813
</PropertyGroup>
914
<PropertyGroup>
1015
<NoThrowNewLib>nothrownew.obj</NoThrowNewLib>
@@ -16,6 +21,7 @@
1621
<ClCompile>
1722
<PreprocessorDefinitions>
1823
%(PreprocessorDefinitions);
24+
_CHAKRACOREBUILD;
1925
_WIN32_WINNT=$(Win32_WinNTVersion);
2026
WINVER=$(Win32_WinNTVersion);
2127
WIN32_LEAN_AND_MEAN=1
@@ -24,10 +30,23 @@
2430
%(PreprocessorDefinitions);
2531
DISABLE_JIT=1
2632
</PreprocessorDefinitions>
27-
<PreprocessorDefinitions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">
33+
<PreprocessorDefinitions Condition="'$(BuildScriptDebug)'=='false'">
34+
%(PreprocessorDefinitions);
35+
BUILD_WITHOUT_SCRIPT_DEBUG=1
36+
</PreprocessorDefinitions>
37+
<PreprocessorDefinitions Condition="'$(BuildLite)'=='true'">
38+
%(PreprocessorDefinitions);
39+
CHAKRACORE_LITE
40+
</PreprocessorDefinitions>
41+
<PreprocessorDefinitions Condition="'$(IntlICU)'=='true'">
42+
%(PreprocessorDefinitions);
43+
INTL_ICU=1
44+
</PreprocessorDefinitions>
45+
<PreprocessorDefinitions Condition="'$(ForceSWB)'=='true'">
2846
%(PreprocessorDefinitions);
29-
BYTECODE_TESTING=1
47+
GLOBAL_ENABLE_WRITE_BARRIER=1
3048
</PreprocessorDefinitions>
49+
<PreprocessorDefinitions Condition="'$(NTDDIVersion)'!=''" >%(PreprocessorDefinitions);NTDDI_VERSION=$(NTDDIVersion)</PreprocessorDefinitions>
3150
<!-- REVIEW: These are warning are introduced when moving to VS2015 tools, may want to clean these up -->
3251
<DisableSpecificWarnings>
3352
%(DisableSpecificWarnings);
@@ -42,15 +61,11 @@
4261
$(IntDir)..\CoreManifests\
4362
%(AdditionalIncludeDirectories)
4463
</AdditionalIncludeDirectories>
45-
46-
<!-- ======== For Code Coverage ======== -->
47-
<Optimization Condition="'$(ENABLE_CODECOVERAGE)'=='true'">Disabled</Optimization>
4864
</ClCompile>
4965

50-
<Link>
51-
<!-- ======== For Code Coverage ======== -->
52-
<AdditionalOptions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">%(AdditionalOptions) /DEBUGTYPE:CV,FIXUP</AdditionalOptions>
53-
</Link>
66+
<ResourceCompile>
67+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_CHAKRACOREBUILD</PreprocessorDefinitions>
68+
</ResourceCompile>
5469
</ItemDefinitionGroup>
5570

5671
<!-- Link dependencies for projects that link with Chakra libraries -->
@@ -64,7 +79,7 @@
6479
ole32.lib
6580
</RLCommonLinkDependencies>
6681
</PropertyGroup>
67-
<PropertyGroup Condition="'$(OptimizedBuild)'!='true'">
82+
<PropertyGroup Condition="'$(DebugBuild)'=='true'">
6883
<ChakraCommonLinkDependencies>
6984
$(ChakraCommonLinkDependencies);
7085
dbghelp.lib;

‎Build/Chakra.Core.sln‎

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "..\bin\ChakraCore\ChakraCore.vcxproj", "{EA882C8D-81FC-42FE-ABD5-2666DB933FDB}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChakraCore", "..\bin\Chakra
2828
EndProject
2929
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{D8216B93-BD6E-4293-8D98-79CEF7CF66BC}"
3030
EndProject
31-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\common\codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
31+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Codex", "..\lib\Common\Codex\Chakra.Common.Codex.vcxproj", "{1876E800-AD77-48C4-A2F7-E5265F24AC38}"
3232
EndProject
3333
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.ByteCode", "..\lib\Runtime\ByteCode\Chakra.Runtime.ByteCode.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110F5}"
3434
ProjectSection(ProjectDependencies) = postProject
@@ -55,7 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Types", "..\
5555
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
5656
EndProjectSection
5757
EndProject
58-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\common\common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
58+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Common", "..\lib\Common\Common\Chakra.Common.Common.vcxproj", "{BB4153FF-AC3E-4734-B562-CC23812DF31B}"
5959
ProjectSection(ProjectDependencies) = postProject
6060
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
6161
EndProjectSection
@@ -64,16 +64,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Runtime", "Runtime", "{DDF4
6464
EndProject
6565
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{546172B2-F084-4363-BE35-06010663D319}"
6666
EndProject
67-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\common\core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
67+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Core", "..\lib\Common\Core\Chakra.Common.Core.vcxproj", "{CC4153FF-AC3E-4734-B562-CC23812DF31B}"
6868
ProjectSection(ProjectDependencies) = postProject
6969
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
7070
EndProjectSection
7171
EndProject
72-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
72+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.DataStructures", "..\lib\Common\DataStructures\Chakra.Common.DataStructures.vcxproj", "{5643D42A-C38D-4D82-9662-58470B3AC9F7}"
7373
EndProject
74-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
74+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Exceptions", "..\lib\Common\Exceptions\Chakra.Common.Exceptions.vcxproj", "{FD8EEC40-4141-448A-BF4B-1589FBE4F60D}"
7575
EndProject
76-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
76+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Memory", "..\lib\Common\Memory\Chakra.Common.Memory.vcxproj", "{BB4153FF-AC3E-4734-B562-FF23812DF31B}"
7777
ProjectSection(ProjectDependencies) = postProject
7878
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
7979
EndProjectSection
@@ -88,13 +88,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Parser", "..\lib\Par
8888
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
8989
EndProjectSection
9090
EndProject
91-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt", "..\lib\jsrt\Chakra.Jsrt.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220F5}"
91+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt", "..\lib\Jsrt\Chakra.Jsrt.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220F5}"
9292
ProjectSection(ProjectDependencies) = postProject
9393
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
9494
{0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719} = {0DB5ECBC-9385-4A65-BE2C-4EF7C65CB719}
9595
EndProjectSection
9696
EndProject
97-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt.Core", "..\lib\jsrt\core\Chakra.Jsrt.Core.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220EE}"
97+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Jsrt.Core", "..\lib\Jsrt\Core\Chakra.Jsrt.Core.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9220EE}"
9898
ProjectSection(ProjectDependencies) = postProject
9999
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
100100
EndProjectSection
@@ -104,7 +104,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Math", "..\l
104104
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
105105
EndProjectSection
106106
EndProject
107-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\common\util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
107+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Common.Util", "..\lib\Common\util\Chakra.Common.Util.vcxproj", "{6979EC58-7A28-465C-A694-F3323A1F5401}"
108108
EndProject
109109
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{158C8616-750C-4E0E-BD3D-5721D3C555E6}"
110110
EndProject
@@ -119,12 +119,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch", "..\bin\ch\ch.vcxproj"
119119
EndProject
120120
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rl", "..\bin\rl\rl.vcxproj", "{80A70F57-0F89-458F-AFD3-CE2159EB9BB1}"
121121
EndProject
122-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Base", "..\lib\Runtime\base\Chakra.Runtime.Base.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110EE}"
122+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.Runtime.Base", "..\lib\Runtime\Base\Chakra.Runtime.Base.vcxproj", "{706083F7-6AA4-4558-A153-6352EF9110EE}"
123123
ProjectSection(ProjectDependencies) = postProject
124124
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
125125
EndProjectSection
126126
EndProject
127127
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra.WasmReader", "..\lib\WasmReader\Chakra.WasmReader.vcxproj", "{53D52B0B-86D9-4D31-AD09-0D6B3C063ADD}"
128+
ProjectSection(ProjectDependencies) = postProject
129+
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}
130+
EndProjectSection
128131
EndProject
129132
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GCStress", "..\bin\GCStress\GCStress.vcxproj", "{73CE5C59-E0BA-413D-A73C-3EECE067891B}"
130133
ProjectSection(ProjectDependencies) = postProject
@@ -148,6 +151,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manifests", "Manifests", "{
148151
EndProject
149152
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoreManifests", "..\manifests\CoreManifests.vcxproj", "{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}"
150153
EndProject
154+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pal", "..\pal\pal.vcxproj", "{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}"
155+
EndProject
156+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wabt", "..\lib\wabt\wabt.vcxproj", "{F48B3491-81DF-4F49-B35F-3308CBE6A379}"
157+
EndProject
151158
Global
152159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
153160
Debug|ARM = Debug|ARM
@@ -683,6 +690,28 @@ Global
683690
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x64.Build.0 = Test|x64
684691
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x86.ActiveCfg = Test|Win32
685692
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A}.Test|x86.Build.0 = Test|Win32
693+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Debug|ARM.ActiveCfg = Debug|Win32
694+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Debug|x64.ActiveCfg = Debug|x64
695+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Debug|x86.ActiveCfg = Debug|Win32
696+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Release|ARM.ActiveCfg = Release|Win32
697+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Release|x64.ActiveCfg = Release|x64
698+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Release|x86.ActiveCfg = Release|Win32
699+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Test|ARM.ActiveCfg = Release|x64
700+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Test|x64.ActiveCfg = Release|x64
701+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22}.Test|x86.ActiveCfg = Release|Win32
702+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Debug|ARM.ActiveCfg = Debug|ARM
703+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Debug|x64.ActiveCfg = Debug|x64
704+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Debug|x64.Build.0 = Debug|x64
705+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Debug|x86.ActiveCfg = Debug|Win32
706+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Debug|x86.Build.0 = Debug|Win32
707+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Release|ARM.ActiveCfg = Release|ARM
708+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Release|x64.ActiveCfg = Release|x64
709+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Release|x86.ActiveCfg = Release|Win32
710+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Test|ARM.ActiveCfg = Test|ARM
711+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Test|x64.ActiveCfg = Test|x64
712+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Test|x64.Build.0 = Test|x64
713+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Test|x86.ActiveCfg = Test|Win32
714+
{F48B3491-81DF-4F49-B35F-3308CBE6A379}.Test|x86.Build.0 = Test|Win32
686715
EndGlobalSection
687716
GlobalSection(SolutionProperties) = preSolution
688717
HideSolutionNode = FALSE
@@ -723,5 +752,7 @@ Global
723752
{EDEB02E2-F389-4CBF-AE7D-3041A934F86B} = {D3BA0BFC-4757-4B73-994F-3556950884A1}
724753
{984BE359-87F7-4BD7-A823-AD8A59739801} = {158C8616-750C-4E0E-BD3D-5721D3C555E6}
725754
{2F6A1847-BFAF-4B8A-9463-AC39FB46B96A} = {984BE359-87F7-4BD7-A823-AD8A59739801}
755+
{02D4FD92-AD34-40CA-85DF-4D6C7E3A1F22} = {546172B2-F084-4363-BE35-06010663D319}
756+
{F48B3491-81DF-4F49-B35F-3308CBE6A379} = {D8216B93-BD6E-4293-8D98-79CEF7CF66BC}
726757
EndGlobalSection
727758
EndGlobal

0 commit comments

Comments
 (0)