diff --git a/CMakeLists.txt b/CMakeLists.txt index fed8704f6b..1b98469e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,7 +309,7 @@ endif(UNIX) if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - set( CMAKE_C_FLAGS "-Wall -Werror -O4 -fvisibility=hidden ${CMAKE_C_FLAGS}" ) + set( CMAKE_C_FLAGS "-Wall -O4 -fvisibility=hidden ${CMAKE_C_FLAGS}" ) endif () source_group("Headers Private" FILES ${HDR_PRIVATE}) diff --git a/README b/README index 37436e83f9..9416920d20 100644 --- a/README +++ b/README @@ -1,20 +1,16 @@ -This is the libwebsockets C library for lightweight websocket clients and -servers. For support, visit +TO build lib, need install cmake. - http://libwebsockets.org +iOS: +$cd libwebsockets/ios +$./build_framework.py buildname -and consider joining the project mailing list at - http://ml.libwebsockets.org/mailman/listinfo/libwebsockets +Android: +$export ANDROID_NDK=/absolute/path/to/the/android-ndk +$cd libwebsockets/android +$./scripts/cmake_android_armeabi.sh -You can get the latest version of the library from git +If you Android NDK is x86_64, you may need put below code to android.toolchain.cmake -http://git.libwebsockets.org -https://github.com/warmcat/libwebsockets - -for more information: - -README.build - information on building the library -README.coding - information for writing code using the library -README.test-apps - information about the test apps built with the library +set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" ) diff --git a/test-server/test-ping.c b/test-server/test-ping.c index 098981cf7a..b209d059f8 100644 --- a/test-server/test-ping.c +++ b/test-server/test-ping.c @@ -338,7 +338,7 @@ int main(int argc, char **argv) char ip[30]; #ifndef WIN32 struct sigaction sa; - struct winsize w; + //struct winsize w; #endif struct timeval tv; unsigned long oldus = 0; @@ -420,10 +420,10 @@ int main(int argc, char **argv) } #ifndef WIN32 - if (isatty(STDOUT_FILENO)) - if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) - if (w.ws_col > 0) - screen_width = w.ws_col; + //if (isatty(STDOUT_FILENO)) + // if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) + // if (w.ws_col > 0) + // screen_width = w.ws_col; #endif info.port = CONTEXT_PORT_NO_LISTEN;