iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

android cmake support

Browse source
This commit is contained in:
Rahul Jadhav 2020-05-16 20:04:38 +08:00
parent 94840e99d9
commit 21c6983ab5
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -12,6 +12,11 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
IF(NOT GLIBC_VERSION EQUAL "" AND GLIBC_VERSION VERSION_LESS 2.17) IF(NOT GLIBC_VERSION EQUAL "" AND GLIBC_VERSION VERSION_LESS 2.17)
SET(LIBS ${LIBS} rt) SET(LIBS ${LIBS} rt)
ENDIF() ENDIF()
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Android")
# for android-ndk >= r19b
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY "BOTH")
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE "BOTH")
set(CMAKE_FIND_ROOT_PATH_MODE_PATH "BOTH")
ENDIF() ENDIF()
IF("${CMAKE_BUILD_TYPE}" STREQUAL "") IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@ -166,6 +171,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
link_directories( /usr/local/lib ) link_directories( /usr/local/lib )
ENDIF() ENDIF()
IF (NOT TESTS STREQUAL "NO")
# Find zlib and libevent header files and library files # Find zlib and libevent header files and library files
# TODO: libevent is not strictly necessary to build the library. # TODO: libevent is not strictly necessary to build the library.
FIND_PATH(ZLIB_INCLUDE_DIR NAMES zlib.h) FIND_PATH(ZLIB_INCLUDE_DIR NAMES zlib.h)
@ -247,11 +253,12 @@ TARGET_LINK_LIBRARIES(md5_client ${LIBS})
TARGET_LINK_LIBRARIES(echo_server ${LIBS}) TARGET_LINK_LIBRARIES(echo_server ${LIBS})
TARGET_LINK_LIBRARIES(echo_client ${LIBS}) TARGET_LINK_LIBRARIES(echo_client ${LIBS})
add_subdirectory(test)
ENDIF() # TESTS
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(test) IF(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT TESTS STREQUAL "NO")
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
# Our test framework relies on assertions, only compile if assertions are # Our test framework relies on assertions, only compile if assertions are
# enabled. # enabled.
# #

4
src/liblsquic/lsquic_parse_ietf_v1.c
View file

@ -1030,7 +1030,7 @@ ietf_v1_gen_ack_frame (unsigned char *outbuf, size_t outbuf_sz,
rsize = range->high - range->low; rsize = range->high - range->low;
a = vint_val2bits(gap - 1); a = vint_val2bits(gap - 1);
b = vint_val2bits(rsize); b = vint_val2bits(rsize);
if (ecn_needs + (1 << a) + (1 << b) > AVAIL()) if (ecn_needs + (1 << a) + (1 << b) > (unsigned)AVAIL())
break; break;
if (addl_ack_blocks == VINT_MAX_ONE_BYTE) if (addl_ack_blocks == VINT_MAX_ONE_BYTE)
{ {
@ -1055,7 +1055,7 @@ ietf_v1_gen_ack_frame (unsigned char *outbuf, size_t outbuf_sz,
if (ecn_counts) if (ecn_counts)
{ {
assert(ecn_needs <= AVAIL()); assert(ecn_needs <= (unsigned)AVAIL());
for (ecn = 1; ecn <= 3; ++ecn) for (ecn = 1; ecn <= 3; ++ecn)
{ {
vint_write(p, ecn_counts[ecnmap[ecn]], bits[ecnmap[ecn]], 1 << bits[ecnmap[ecn]]); vint_write(p, ecn_counts[ecnmap[ecn]], bits[ecnmap[ecn]], 1 << bits[ecnmap[ecn]]);