Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

loader: Use the static C++ runtime on android. #307

Merged
merged 2 commits into from
May 26, 2022
Merged

loader: Use the static C++ runtime on android. #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36fd8d
loader: Use the static C++ runtime on android.
rpavlik May 26, 2022
73d44ff
Point Azure Pipelines at Visual Studio 2022.
rpavlik May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/openxr-sdk-source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ stages:
parameters:
sourceDir: $(Pipeline.Workspace)/pregen
buildType: RelWithDebInfo
generator: "Visual Studio 16 2019"
generator: "Visual Studio 17 2022"
useVulkan: "false"
2 changes: 1 addition & 1 deletion .azure-pipelines/shared/build_msvc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
default: "Debug"
- name: generator
type: string
default: "Visual Studio 16 2019"
default: "Visual Studio 17 2022"
- name: cmakeArgs
type: string
default: ""
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/shared/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import json
import sys

VS_VERSION = 'Visual Studio 16 2019'
VS_VERSION = 'Visual Studio 17 2022'

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

Expand Down
2 changes: 1 addition & 1 deletion src/loader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ android {
versionCode = project.versionOpenXR.getVersionCode()
externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared",
arguments "-DANDROID_STL=c++_static",
"-DBUILD_API_LAYERS=OFF",
"-DBUILD_TESTS=OFF",
"-DBUILD_LOADER=ON",
Expand Down