File tree Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 50
50
# a "-std=<something>".
51
51
# For a C project, you would set this to something like 'c99' instead of
52
52
# 'c++11'.
53
- '-std=c++11 ' ,
53
+ '-std=c++17 ' ,
54
54
# ...and the same thing goes for the magic -x option which specifies the
55
55
# language that the files to be compiled are written in. This is mostly
56
56
# relevant for c++ headers.
Original file line number Diff line number Diff line change @@ -393,7 +393,7 @@ if(NOT MSVC)
393
393
endif ()
394
394
395
395
if (ANDROID)
396
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu ++17" )
396
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c ++17" )
397
397
endif ()
398
398
if (CLANG)
399
399
add_definitions (
Original file line number Diff line number Diff line change 4
4
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
5
5
# yes, it's really CPPFLAGS for C++
6
6
# 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
8
8
LOCAL_C_INCLUDES := \
9
9
$(LOCAL_PATH ) /../../Common \
10
10
$(LOCAL_PATH ) /../.. \
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ LOCAL_SRC_FILES := \
58
58
59
59
60
60
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
62
62
# Note: LOCAL_PATH is the directory this file is in.
63
63
LOCAL_C_INCLUDES := $(LOCAL_PATH ) /.. $(LOCAL_PATH ) /../libzip $(LOCAL_PATH ) /../glslang ..
64
64
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \
24
24
../miniupnp/miniupnpc/src/upnpreplyparse.c
25
25
26
26
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
28
28
# Note: LOCAL_PATH is the directory this file is in.
29
29
LOCAL_C_INCLUDES := $(LOCAL_PATH ) /.. $(LOCAL_PATH ) /../miniupnp/miniupnpc/src $(LOCAL_PATH ) /../miniupnp/miniupnpc/include ..
30
30
You can’t perform that action at this time.
0 commit comments