File tree Expand file tree Collapse file tree 2 files changed +33
-13
lines changed
Expand file tree Collapse file tree 2 files changed +33
-13
lines changed Original file line number Diff line number Diff line change @@ -100,22 +100,28 @@ libretro-build-osx-arm64:
100100
101101# ################################## CELLULAR #################################
102102# Android ARMv7a
103- # android-armeabi-v7a:
104- # extends:
105- # - .libretro-android-jni-armeabi-v7a
106- # - .core-defs
103+ android-armeabi-v7a :
104+ extends :
105+ - .libretro-android-jni-armeabi-v7a
106+ - .core-defs
107+ variables :
108+ NDK_ROOT : /android-sdk-linux/ndk/26.2.11394342
107109
108110# Android ARMv8a
109- # android-arm64-v8a:
110- # extends:
111- # - .libretro-android-jni-arm64-v8a
112- # - .core-defs
111+ android-arm64-v8a :
112+ extends :
113+ - .libretro-android-jni-arm64-v8a
114+ - .core-defs
115+ variables :
116+ NDK_ROOT : /android-sdk-linux/ndk/26.2.11394342
113117
114118# Android 64-bit x86
115- # android-x86_64:
116- # extends:
117- # - .libretro-android-jni-x86_64
118- # - .core-defs
119+ android-x86_64 :
120+ extends :
121+ - .libretro-android-jni-x86_64
122+ - .core-defs
123+ variables :
124+ NDK_ROOT : /android-sdk-linux/ndk/26.2.11394342
119125
120126# iOS
121127libretro-build-ios-arm64 :
Original file line number Diff line number Diff line change @@ -70,9 +70,23 @@ using std::istream;
7070using std::ostream;
7171using std::fstream;
7272using std::iostream;
73- using std::ostringstream;
7473using std::istringstream;
74+ // Android NDK 26 libc++ lacks ostringstream::view() (C++20 P0408R7)
75+ #if defined(__ANDROID__) && !defined(__cpp_lib_sstream_from_string_view)
76+ class ostringstream : public std ::ostringstream {
77+ public:
78+ using std::ostringstream::ostringstream;
79+ std::string view () const { return str (); }
80+ };
81+ class stringstream : public std ::stringstream {
82+ public:
83+ using std::stringstream::stringstream;
84+ std::string view () const { return str (); }
85+ };
86+ #else
87+ using std::ostringstream;
7588using std::stringstream;
89+ #endif
7690using std::unique_ptr;
7791using std::shared_ptr;
7892using std::make_unique;
You can’t perform that action at this time.
0 commit comments