1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00

Fixed windows build.

- Fixed the original visual studio project so that inline gets defined.
- Fix error in CMake with zlib.
This commit is contained in:
Joakim Soderberg 2013-02-06 15:30:33 +09:00 committed by Andy Green
parent e9a42119f6
commit 91de93391c
2 changed files with 7 additions and 1 deletions

View file

@ -308,7 +308,7 @@ if (WIN32 AND NOT USE_EXTERNAL_ZLIB)
# Set the same variables as find_package would.
set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH})
get_property(ZLIB_LIBRARIES TARGET zlib PROPERTY LOCATION)
get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION)
set(ZLIB_FOUND 1)
else()
find_package(ZLIB REQUIRED)

View file

@ -18,11 +18,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA
*/
// System introspection configs.
#ifdef CMAKE_BUILD
#include "lws_config.h"
#else
#ifdef WIN32
#define inline __inline
#else
#include "config.h"
#endif
#endif
#if _MSC_VER > 1000 || defined(_WIN32)
#else