From 0fbc0b78e0f12a1700470b9ca3def0f4cdd6a1ff Mon Sep 17 00:00:00 2001 From: Kevin Smith <git@kismith.co.uk> Date: Wed, 17 Nov 2010 08:03:10 +0000 Subject: Fix build on VS2008 diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript index eafb2b1..1a8510d 100644 --- a/3rdParty/LibIDN/SConscript +++ b/3rdParty/LibIDN/SConscript @@ -15,6 +15,8 @@ if env.get("LIBIDN_BUNDLED", False) : } if env["PLATFORM"] == "win32" : env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] + if env["MSVC_VERSION"][:3] == "9.0" : + env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/VC2008")] ################################################################################ # Build @@ -46,6 +48,8 @@ if env.get("LIBIDN_BUNDLED", False) : myenv.Append(CPPPATH = ["src", "stubs"]) if myenv["PLATFORM"] == "win32" : myenv.Append(CPPPATH = "stubs/win32") + if myenv["MSVC_VERSION"][:3] == "9.0" : + myenv.Append(CPPPATH = "stubs/win32/VC2008") myenv.StaticLibrary("IDN", [ "src/stringprep.c", diff --git a/3rdParty/LibIDN/stubs/win32/VC2008/stdint.h b/3rdParty/LibIDN/stubs/win32/VC2008/stdint.h new file mode 100644 index 0000000..6a57ff9 --- /dev/null +++ b/3rdParty/LibIDN/stubs/win32/VC2008/stdint.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2008 Free Software Foundation, Inc. + Written by Adam Strzelecki <ono@java.pl> + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation; either version 2.1, + or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#ifndef _AC_STDINT_H +#define _AC_STDINT_H 1 +#ifndef _GENERATED_STDINT_H +#define _GENERATED_STDINT_H + +#define uint8_t unsigned char +#define uint16_t unsigned short +#define uint32_t unsigned int +#define int8_t signed char +#define int16_t signed short +#define int32_t signed int + +#define gint16 int16_t + +#ifdef _WIN64 +typedef __int64 ssize_t; +#else +typedef _W64 int ssize_t; +#endif + +#endif +#endif -- cgit v0.10.2-6-g49f6