Skip to content

Commit 9a69efb

Browse files
authored
Merge branch 'main' into seanmcm/updateLoc_1_31_1
2 parents 1e15e9e + df350e6 commit 9a69efb

File tree

6 files changed

+129
-61
lines changed

6 files changed

+129
-61
lines changed
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{
2-
"defaults": [
3-
"-D_MSC_EXTENSIONS",
4-
"--microsoft",
5-
"--microsoft_bugs",
6-
"--microsoft_version",
7-
"1950",
8-
"-D_MSC_VER=1950",
9-
"-D_MSC_FULL_VER=195035717",
10-
"-D_MSC_BUILD=0",
11-
"-D_M_ARM=7"
12-
],
13-
"defaults_op": "merge"
14-
}
1+
{
2+
"defaults": [
3+
"-D_MSC_EXTENSIONS",
4+
"--microsoft",
5+
"--microsoft_bugs",
6+
"--microsoft_version",
7+
"1951",
8+
"-D_MSC_VER=1951",
9+
"-D_MSC_FULL_VER=195136122",
10+
"-D_MSC_BUILD=0",
11+
"-D_M_ARM=7"
12+
],
13+
"defaults_op": "merge"
14+
}
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
{
2-
"defaults": [
3-
"-D_MSC_EXTENSIONS",
4-
"--microsoft",
5-
"--microsoft_bugs",
6-
"--microsoft_version",
7-
"1950",
8-
"-D_CPPUNWIND=1",
9-
"-D_MSC_VER=1950",
10-
"-D_MSC_FULL_VER=195035717",
11-
"-D_MSC_BUILD=0",
12-
"-D_M_ARM64=1"
13-
],
14-
"defaults_op": "merge"
15-
}
1+
{
2+
"defaults": [
3+
"-D_MSC_EXTENSIONS",
4+
"--microsoft",
5+
"--microsoft_bugs",
6+
"--microsoft_version",
7+
"1951",
8+
"-D_CPPUNWIND=1",
9+
"-D_MSC_VER=1951",
10+
"-D_MSC_FULL_VER=195136122",
11+
"-D_MSC_BUILD=0",
12+
"-D_M_ARM64=1"
13+
],
14+
"defaults_op": "merge"
15+
}
Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
{
2-
"defaults": [
3-
"-D_MSC_EXTENSIONS",
4-
"--microsoft",
5-
"--microsoft_bugs",
6-
"--microsoft_version",
7-
"1950",
8-
"-D_CPPUNWIND=1",
9-
"-D_MSC_VER=1950",
10-
"-D_MSC_FULL_VER=195035717",
11-
"-D_MSC_BUILD=0",
12-
"-D_M_X64=100",
13-
"-D_M_AMD64=100"
14-
],
15-
"defaults_op": "merge"
16-
}
1+
{
2+
"defaults": [
3+
"-D_MSC_EXTENSIONS",
4+
"--microsoft",
5+
"--microsoft_bugs",
6+
"--microsoft_version",
7+
"1951",
8+
"-D_CPPUNWIND=1",
9+
"-D_MSC_VER=1951",
10+
"-D_MSC_FULL_VER=195136122",
11+
"-D_MSC_BUILD=0",
12+
"-D_M_X64=100",
13+
"-D_M_AMD64=100"
14+
],
15+
"defaults_op": "merge"
16+
}
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
{
2-
"defaults": [
3-
"-D_MSC_EXTENSIONS",
4-
"--microsoft",
5-
"--microsoft_bugs",
6-
"--microsoft_version",
7-
"1950",
8-
"-D_MSC_VER=1950",
9-
"-D_MSC_FULL_VER=195035717",
10-
"-D_MSC_BUILD=0",
11-
"-D_M_IX86=600",
12-
"-D_M_IX86_FP=2"
13-
],
14-
"defaults_op": "merge"
15-
}
1+
{
2+
"defaults": [
3+
"-D_MSC_EXTENSIONS",
4+
"--microsoft",
5+
"--microsoft_bugs",
6+
"--microsoft_version",
7+
"1951",
8+
"-D_MSC_VER=1951",
9+
"-D_MSC_FULL_VER=195136122",
10+
"-D_MSC_BUILD=0",
11+
"-D_M_IX86=600",
12+
"-D_M_IX86_FP=2"
13+
],
14+
"defaults_op": "merge"
15+
}

0 commit comments

Comments
 (0)