Skip to content

Commit 7f0305a

Browse files
committed
Unify the specified C++ standard as c++17.
May fix the build of hrydgard#19952
1 parent 5080e96 commit 7f0305a

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.ycm_extra_conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# a "-std=<something>".
5151
# For a C project, you would set this to something like 'c99' instead of
5252
# 'c++11'.
53-
'-std=c++11',
53+
'-std=c++17',
5454
# ...and the same thing goes for the magic -x option which specifies the
5555
# language that the files to be compiled are written in. This is mostly
5656
# relevant for c++ headers.

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ if(NOT MSVC)
393393
endif()
394394

395395
if(ANDROID)
396-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
396+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
397397
endif()
398398
if(CLANG)
399399
add_definitions(

android/jni/Locals.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
LOCAL_CFLAGS := -DUSE_FFMPEG -DWITH_UPNP -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
55
# yes, it's really CPPFLAGS for C++
66
# deprecated-register is generated by Android default code and causes noise.
7-
LOCAL_CPPFLAGS := -fexceptions -std=gnu++17 -fno-rtti -Wno-reorder -Wno-deprecated-register -Wno-nullability-completeness
7+
LOCAL_CPPFLAGS := -fexceptions -std=c++17 -fno-rtti -Wno-reorder -Wno-deprecated-register -Wno-nullability-completeness
88
LOCAL_C_INCLUDES := \
99
$(LOCAL_PATH)/../../Common \
1010
$(LOCAL_PATH)/../.. \

ext/glslang-build/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ LOCAL_SRC_FILES := \
5858

5959

6060
LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS -DENABLE_HLSL
61-
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
61+
LOCAL_CPPFLAGS := -fno-exceptions -std=c++17 -fno-rtti -Wno-reorder
6262
# Note: LOCAL_PATH is the directory this file is in.
6363
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../libzip $(LOCAL_PATH)/../glslang ..
6464

ext/miniupnp-build/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \
2424
../miniupnp/miniupnpc/src/upnpreplyparse.c
2525

2626
LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS
27-
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
27+
LOCAL_CPPFLAGS := -fno-exceptions -std=c++17 -fno-rtti -Wno-reorder
2828
# Note: LOCAL_PATH is the directory this file is in.
2929
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp/miniupnpc/src $(LOCAL_PATH)/../miniupnp/miniupnpc/include ..
3030

0 commit comments

Comments
 (0)