From 1c3c962ea1fa661adeabaf674c334d4918a13566 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Wed, 16 Feb 2011 11:22:34 +0000 Subject: [PATCH] Import libcurl for Windows This was SVN commit r8924. --- build/premake/extern_libs.lua | 5 +++ source/lib/external_libraries/curl.h | 48 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 source/lib/external_libraries/curl.h diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua index d9efd80456..544b7459cf 100644 --- a/build/premake/extern_libs.lua +++ b/build/premake/extern_libs.lua @@ -136,6 +136,11 @@ extern_lib_defs = { unix_names = { "avcodec", "avformat", "avutil" }, dbg_suffix = "", }, + libcurl = { + win_names = { "curllib" }, + unix_names = { "curl" }, + dbg_suffix = "", + }, libjpg = { win_names = { "jpeg-6b" }, unix_names = { "jpeg" }, diff --git a/source/lib/external_libraries/curl.h b/source/lib/external_libraries/curl.h new file mode 100644 index 0000000000..893d3371ab --- /dev/null +++ b/source/lib/external_libraries/curl.h @@ -0,0 +1,48 @@ +/* Copyright (c) 2011 Wildfire Games + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * bring in libcurl header, with compatibility fixes + */ + +#ifndef INCLUDED_CURL +#define INCLUDED_CURL + +// curl.h wants to include winsock2.h which causes conflicts. +// provide some required definitions from winsock.h, then pretend +// we already included winsock.h + +typedef uintptr_t SOCKET; + +struct sockaddr +{ + unsigned short sa_family; + char sa_data[14]; +}; + +struct fd_set; + +#define _WINSOCKAPI_ // winsock.h include guard + +#include + +#endif // #ifndef INCLUDED_CURL