Skip to content

Commit 6a9ffcf

Browse files
committed
Update Android to C++20
1 parent e90bfdb commit 6a9ffcf

File tree

192 files changed

+195
-192
lines changed

Some content is hidden

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

192 files changed

+195
-192
lines changed

android/examples/_template/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(SRC_DIR ../../../examples/${NAME})
88
set(BASE_DIR ../../../base)
99
set(EXTERNAL_DIR ../../../external)
1010

11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
1212

1313
file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
1414

android/examples/_template/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515
externalNativeBuild {
1616
cmake {
17-
cppFlags "-std=c++14"
17+
cppFlags "-std=c++20"
1818
arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang', '-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON'
1919
}
2020
}

android/examples/bloom/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(SRC_DIR ../../../examples/${NAME})
88
set(BASE_DIR ../../../base)
99
set(EXTERNAL_DIR ../../../external)
1010

11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
1212

1313
file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
1414

android/examples/bloom/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515
externalNativeBuild {
1616
cmake {
17-
cppFlags "-std=c++14"
17+
cppFlags "-std=c++20"
1818
arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang', '-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON'
1919
}
2020
}

android/examples/bufferdeviceaddress/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(SRC_DIR ../../../examples/${NAME})
88
set(BASE_DIR ../../../base)
99
set(EXTERNAL_DIR ../../../external)
1010

11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
1212

1313
file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
1414

android/examples/bufferdeviceaddress/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515
externalNativeBuild {
1616
cmake {
17-
cppFlags "-std=c++14"
17+
cppFlags "-std=c++20"
1818
arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang', '-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON'
1919
}
2020
}

android/examples/computecloth/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(SRC_DIR ../../../examples/${NAME})
88
set(BASE_DIR ../../../base)
99
set(EXTERNAL_DIR ../../../external)
1010

11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
1212

1313
file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
1414

android/examples/computecloth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515
externalNativeBuild {
1616
cmake {
17-
cppFlags "-std=c++14"
17+
cppFlags "-std=c++20"
1818
arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang', '-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON'
1919
}
2020
}

android/examples/computecullandlod/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(SRC_DIR ../../../examples/${NAME})
88
set(BASE_DIR ../../../base)
99
set(EXTERNAL_DIR ../../../external)
1010

11-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES")
1212

1313
file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp")
1414

android/examples/computecullandlod/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515
externalNativeBuild {
1616
cmake {
17-
cppFlags "-std=c++14"
17+
cppFlags "-std=c++20"
1818
arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang', '-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON'
1919
}
2020
}

0 commit comments

Comments
 (0)