Simplify build instructions

3 files changed, 16 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504aa61..5eeb437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,8 @@ add_library(${PROJECT_NAME} SHARED
 	client.cxx)
 
 if (ANDROID)
+	set(ANDROID_BUILD_ABI_${ANDROID_ABI} 1)
+	set(CMAKE_CXX_STANDARD_LIBRARIES ${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so)
 	include_directories(${CMAKE_SYSROOT}/usr/include)
 	target_link_directories(${PROJECT_NAME} PRIVATE
 		${CMAKE_SYSROOT}/usr/lib/${ANDROID_TOOLCHAIN_NAME}/${ANDROID_NATIVE_API_LEVEL})
diff --git a/README.md b/README.md
index 010acba..d74a8a7 100644
--- a/README.md
+++ b/README.md
@@ -6,46 +6,45 @@
 
 ```sh
 $ git clone git://darapsa.org/qrtclient.git
-$ cd qrtclient
 ```
 
 ## Configuring for various target hosts (with optional debugging)
 
 ```sh
-$ mkdir build
-$ cmake -DCMAKE_BUILD_TYPE=Debug ..
+$ mkdir build-qrtclient-Desktop-Debug
+$ cd build-qrtclient-Desktop-Debug
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../qrtclient
 ```
 
 or
 
 ```sh
-$ mkdir build-Android_arm64_v8a-Debug
-$ cd build-Android_arm64_v8a-Debug
-$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_arm64-v8a=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DANDROID_ABI=arm64-v8a -DCMAKE_CXX_STANDARD_LIBRARIES=/opt/android-ndk/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so ..
+$ mkdir build-qrtclient-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_1_for_Android-Debug
+$ cd build-qrtclient-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_1_for_Android-Debug
+```
+
+and then
+
+```sh
+$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r21/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_ABI=arm64-v8a -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DCMAKE_BUILD_TYPE=Debug ../qrtclient
 ```
 
 or
 
 ```sh
-$ mkdir build-Android_armeabi_v7a-Debug
-$ cd build-Android_armeabi_v7a-Debug
-$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_armeabi_v7a=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DANDROID_ABI=armeabi-v7a -DCMAKE_CXX_STANDARD_LIBRARIES=/opt/android-ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/libc++_shared.so ..
+$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r21/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_ABI=armeabi_v7a -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DCMAKE_BUILD_TYPE=Debug ../qrtclient
 ```
 
 or
 
 ```sh
-$ mkdir build-Android_x86-Debug
-$ cd build-Android_x86-Debug
-$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DANDROID_ABI=x86 -DCMAKE_CXX_STANDARD_LIBRARIES=/opt/android-ndk/sources/cxx-stl/llvm-libc++/libs/x86/libc++_shared.so ..
+$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r21/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_ABI=x86 -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DCMAKE_BUILD_TYPE=Debug ../qrtclient
 ```
 
 or
 
 ```sh
-$ mkdir build-Android_x86_64-Debug
-$ cd build-Android_x86_64-Debug
-$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86_64=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DANDROID_ABI=x86_64 -DCMAKE_CXX_STANDARD_LIBRARIES=/opt/android-ndk/sources/cxx-stl/llvm-libc++/libs/x86_64/libc++_shared.so ..
+$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r21/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_ABI=x86_64 -DCMAKE_INSTALL_PREFIX=/opt/Qt5.14.1/5.14.1/android -DCMAKE_BUILD_TYPE=Debug ../qrtclient
 ```
 
 or so on.
diff --git a/librtclient b/librtclient
-Subproject 4e74f8c8d376efdcdfd967a447021cc9681fed4
+Subproject c33432a46298104a3f79166ba49c0c6668d9686