From d2b940d9fc6ade0254925fa547853223770f3e20 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Sun, 15 Jul 2012 11:01:17 -0500 Subject: [PATCH] fix windows spandsp build for recent commits --- libs/spandsp/src/libspandsp.2008.vcproj | 1532 +++++++++++++---- libs/spandsp/src/libspandsp.2010.vcxproj | 9 + .../src/libspandsp.2010.vcxproj.filters | 27 + libs/spandsp/src/msvc/spandsp.h | 2 + libs/spandsp/src/t4_tx.c | 4 + libs/spandsp/src/t85_encode.c | 4 + 6 files changed, 1250 insertions(+), 328 deletions(-) diff --git a/libs/spandsp/src/libspandsp.2008.vcproj b/libs/spandsp/src/libspandsp.2008.vcproj index 027a6fc664..d5964ec4d6 100644 --- a/libs/spandsp/src/libspandsp.2008.vcproj +++ b/libs/spandsp/src/libspandsp.2008.vcproj @@ -8,18 +8,18 @@ Keyword="Win32Proj" TargetFrameworkVersion="131072" > - - + - - - - - - + + + + - + + + + + - + + + - - - - - - + + + + + + - + + + + + - + + + - - + + + + + + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj b/libs/spandsp/src/libspandsp.2010.vcxproj index 393a1b6d45..398b5dc7e0 100644 --- a/libs/spandsp/src/libspandsp.2010.vcxproj +++ b/libs/spandsp/src/libspandsp.2010.vcxproj @@ -208,6 +208,8 @@ + + @@ -218,6 +220,9 @@ + + + @@ -282,6 +287,8 @@ + + @@ -304,6 +311,8 @@ + + diff --git a/libs/spandsp/src/libspandsp.2010.vcxproj.filters b/libs/spandsp/src/libspandsp.2010.vcxproj.filters index c75936a851..fef56df81d 100644 --- a/libs/spandsp/src/libspandsp.2010.vcxproj.filters +++ b/libs/spandsp/src/libspandsp.2010.vcxproj.filters @@ -259,6 +259,21 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -674,6 +689,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/libs/spandsp/src/msvc/spandsp.h b/libs/spandsp/src/msvc/spandsp.h index ba0bc280d6..0abd28068f 100644 --- a/libs/spandsp/src/msvc/spandsp.h +++ b/libs/spandsp/src/msvc/spandsp.h @@ -104,6 +104,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/libs/spandsp/src/t4_tx.c b/libs/spandsp/src/t4_tx.c index 3961bfa94d..7da6ea93a1 100644 --- a/libs/spandsp/src/t4_tx.c +++ b/libs/spandsp/src/t4_tx.c @@ -81,6 +81,10 @@ #include "faxfont.h" +#ifndef UINT32_MAX +#define UINT32_MAX 0xffffffff +#endif + /*! The number of centimetres in one inch */ #define CM_PER_INCH 2.54f diff --git a/libs/spandsp/src/t85_encode.c b/libs/spandsp/src/t85_encode.c index 6bcb3441f5..7577f270d9 100644 --- a/libs/spandsp/src/t85_encode.c +++ b/libs/spandsp/src/t85_encode.c @@ -46,6 +46,10 @@ #include "spandsp/private/t81_t82_arith_coding.h" #include "spandsp/private/t85.h" +#ifndef UINT32_MAX +#define UINT32_MAX 0xffffffff +#endif + /* Image length update status */ enum {