From: Arokux B Date: Thu, 28 Feb 2013 01:25:02 +0000 (+0800) Subject: cmake mingw no need for websock w32 X-Git-Tag: upstream/1.7.3~895 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=897fec3a890515f2766b9e6735222dbba9ae9f41;p=platform%2Fupstream%2Flibwebsockets.git cmake mingw no need for websock w32 2. Comment out this line http://git.warmcat.com/cgi-bin/cgit/libwebsockets/tree/CMakeLists.txt#n279 the file websock-w32.c is already compiled indirectly from libwebsockets.c Signed-off-by: Arokux B --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e40683..2d5f962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,12 +274,16 @@ if (WIN32) ${WIN32_HELPERS_PATH}/websock-w32.h ${WIN32_HELPERS_PATH}/gettimeofday.h ) - +if (MINGW) + list(APPEND SOURCES + ${WIN32_HELPERS_PATH}/gettimeofday.c + ) +else() list(APPEND SOURCES ${WIN32_HELPERS_PATH}/websock-w32.c ${WIN32_HELPERS_PATH}/gettimeofday.c ) - +endif() include_directories(${WIN32_HELPERS_PATH}) else() # Unix.