From f59ee7e17a7d44ee8920cf45d5e825f579d8650d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 6 Jun 2020 23:35:57 +0800 Subject: Remove no longer unnecessary Android specific build settings --- CMakeLists.txt | 8 -------- librtclient | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba3b7e2..c4e8e0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,14 +17,6 @@ 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}) -endif() - target_link_libraries(${PROJECT_NAME} Qt5::Core rtclient diff --git a/librtclient b/librtclient index c33432a..26d4f3f 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit c33432a46298104a3f79166ba49c0c6668d96861 +Subproject commit 26d4f3ffeb64c5d3ac939bd10d2be67afa094076 -- cgit v1.2.3