From 4b1337624fe2882fbe2e8cc42cc9df6521808553 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 12 Dec 2008 17:15:58 +0000 Subject: [PATCH] don't rebuild libshout and mod_shout on every build git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10737 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/win32/libmp3lame/config.h | 120 +++++++++++ libs/win32/libmp3lame/libmp3lame_vc7.vcproj | 28 +-- libs/win32/libshout/libshout.vcproj | 210 +------------------- 3 files changed, 131 insertions(+), 227 deletions(-) create mode 100644 libs/win32/libmp3lame/config.h diff --git a/libs/win32/libmp3lame/config.h b/libs/win32/libmp3lame/config.h new file mode 100644 index 0000000000..67e88fecfa --- /dev/null +++ b/libs/win32/libmp3lame/config.h @@ -0,0 +1,120 @@ +/* The number of bytes in a double. */ +#define SIZEOF_DOUBLE 8 + +/* The number of bytes in a float. */ +#define SIZEOF_FLOAT 4 + +/* The number of bytes in a int. */ +#define SIZEOF_INT 4 + +/* The number of bytes in a long. */ +#define SIZEOF_LONG 4 + +/* The number of bytes in a long double. */ +#define SIZEOF_LONG_DOUBLE 12 + +/* The number of bytes in a short. */ +#define SIZEOF_SHORT 2 + +/* The number of bytes in a unsigned int. */ +#define SIZEOF_UNSIGNED_INT 4 + +/* The number of bytes in a unsigned long. */ +#define SIZEOF_UNSIGNED_LONG 4 + +/* The number of bytes in a unsigned short. */ +#define SIZEOF_UNSIGNED_SHORT 2 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS + +/* Define if you have the header file. */ +#define HAVE_ERRNO_H + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H + +/* Define if you have the header file. */ +#define HAVE_LIMITS_H + +/* Name of package */ +#define PACKAGE "lame" + +/* Version number of package */ +#define VERSION "3.97" + +/* Define if compiler has function prototypes */ +#define PROTOTYPES 1 + +/* enable VBR bitrate histogram */ +#define BRHIST 1 + +/* IEEE754 compatible machine */ +#define TAKEHIRO_IEEE754_HACK 1 + +/* faster log implementation with less but enough precission */ +#define USE_FAST_LOG 1 + +#define HAVE_STRCHR +#define HAVE_MEMCPY + +#if defined(_MSC_VER) || defined(__BORLANDC__) +#pragma warning( disable : 4305 ) + typedef __int8 int8_t; + typedef __int16 int16_t; + typedef __int32 int32_t; + typedef __int64 int64_t; + + typedef unsigned __int8 uint8_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int32 uint32_t; + typedef unsigned __int64 uint64_t; + + typedef float float32_t; + typedef double float64_t; +#elif defined (__GNUC__) +#define __int8_t_defined +#define uint8_t unsigned char +#define uint16_t unsigned short +#define uint32_t unsigned int +#define uint64_t unsigned long long + +#define int8_t signed char +#define int16_t signed short +#define int32_t signed int +#define int64_t signed long long +#endif + +typedef long double ieee854_float80_t; +typedef double ieee754_float64_t; +typedef float ieee754_float32_t; + +#ifdef HAVE_MPGLIB +# define DECODE_ON_THE_FLY 1 +#endif + +#ifdef LAME_ACM +/* memory hacking for driver purposes */ +#define calloc(x,y) acm_Calloc(x,y) +#define free(x) acm_Free(x) +#define malloc(x) acm_Malloc(x) + +#include +void *acm_Calloc( size_t num, size_t size ); +void *acm_Malloc( size_t size ); +void acm_Free( void * mem); +#endif /* LAME_ACM */ + +#define LAME_LIBRARY_BUILD + + +#ifdef HAVE_NASM + #if (defined(__ICL) && (__ICL >= 450)) + #define HAVE_XMMINTRIN_H + #elif defined(_MSC_VER) + #include + #ifdef _mm_malloc + #define HAVE_XMMINTRIN_H + #endif + #endif +#endif diff --git a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj index eec3ea2cbb..17f5c4e119 100644 --- a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj +++ b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GAy /QIfdiv /QI0f" Optimization="2" - AdditionalIncludeDirectories=""..\..\lame-3.97","..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -112,7 +112,7 @@ - - - - - - - - diff --git a/libs/win32/libshout/libshout.vcproj b/libs/win32/libshout/libshout.vcproj index 6af0060fb7..7d0c65b2fe 100644 --- a/libs/win32/libshout/libshout.vcproj +++ b/libs/win32/libshout/libshout.vcproj @@ -20,8 +20,6 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > @@ -68,9 +65,8 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -