Skip to content

Commit 554b17a

Browse files
authored
Merge pull request #307 from rpavlik/android-static-runtime
loader: Use the static C++ runtime on android.
2 parents f680f8d + 73d44ff commit 554b17a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.azure-pipelines/openxr-sdk-source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,5 @@ stages:
108108
parameters:
109109
sourceDir: $(Pipeline.Workspace)/pregen
110110
buildType: RelWithDebInfo
111-
generator: "Visual Studio 16 2019"
111+
generator: "Visual Studio 17 2022"
112112
useVulkan: "false"

.azure-pipelines/shared/build_msvc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
default: "Debug"
88
- name: generator
99
type: string
10-
default: "Visual Studio 16 2019"
10+
default: "Visual Studio 17 2022"
1111
- name: cmakeArgs
1212
type: string
1313
default: ""

.azure-pipelines/shared/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import json
55
import sys
66

7-
VS_VERSION = 'Visual Studio 16 2019'
7+
VS_VERSION = 'Visual Studio 17 2022'
88

99
PLATFORMS = ('Win32', 'x64', 'ARM', 'ARM64')
1010

src/loader/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ android {
107107
versionCode = project.versionOpenXR.getVersionCode()
108108
externalNativeBuild {
109109
cmake {
110-
arguments "-DANDROID_STL=c++_shared",
110+
arguments "-DANDROID_STL=c++_static",
111111
"-DBUILD_API_LAYERS=OFF",
112112
"-DBUILD_TESTS=OFF",
113113
"-DBUILD_LOADER=ON",

0 commit comments

Comments
 (0)