[Freeswitch-svn] [commit] r10737 - in freeswitch/trunk: libs/win32/libmp3lame libs/win32/libshout w32/Library
FreeSWITCH SVN
mikej at freeswitch.org
Fri Dec 12 09:15:59 PST 2008
Author: mikej
Date: Fri Dec 12 12:15:58 2008
New Revision: 10737
Log:
don't rebuild libshout and mod_shout on every build
Added:
freeswitch/trunk/libs/win32/libmp3lame/config.h
Modified:
freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj
freeswitch/trunk/libs/win32/libshout/ (props changed)
freeswitch/trunk/libs/win32/libshout/libshout.vcproj
freeswitch/trunk/w32/Library/ (props changed)
Added: freeswitch/trunk/libs/win32/libmp3lame/config.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/win32/libmp3lame/config.h Fri Dec 12 12:15:58 2008
@@ -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 <errno.h> header file. */
+#define HAVE_ERRNO_H
+
+/* Define if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H
+
+/* Define if you have the <limits.h> 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 <stddef.h>
+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 <malloc.h>
+ #ifdef _mm_malloc
+ #define HAVE_XMMINTRIN_H
+ #endif
+ #endif
+#endif
Modified: freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj (original)
+++ freeswitch/trunk/libs/win32/libmp3lame/libmp3lame_vc7.vcproj Fri Dec 12 12:15:58 2008
@@ -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 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""..\..\lame-3.97","..\..\lame-3.97\include""
+ AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include""
PreprocessorDefinitions="_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/libmp3lame_vc6.pch"
@@ -655,30 +655,6 @@
>
</File>
<File
- RelativePath="..\..\lame-3.97\configMS.h"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step on $(InputName)"
- CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h
"
- Outputs="..\config.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing Custom Build Step on $(InputName)"
- CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h
"
- Outputs="..\config.h"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\lame-3.97\libmp3lame\encoder.h"
>
</File>
Modified: freeswitch/trunk/libs/win32/libshout/libshout.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/libshout/libshout.vcproj (original)
+++ freeswitch/trunk/libs/win32/libshout/libshout.vcproj Fri Dec 12 12:15:58 2008
@@ -20,8 +20,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
@@ -44,14 +42,13 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\,..\..\libshout-2.2.2\src,..\..\libshout-2.2.2\include,..\..\libogg-1.1.3\include,..\..\pthreads-w32-2-7-0-release,..\..\libshout-2.2.2\win32\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32;VERSION=\"2.0.0\";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;_LIB;_WIN32;VERSION=\"2.0.0\";LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile="$(ConfigurationName)/libshout.pch"
- AssemblerListingLocation=".$(ConfigurationName)"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName="$(ConfigurationName)"
+ AssemblerListingLocation=".\Static_Release/"
+ ObjectFile=".\Static_Release/"
+ ProgramDataBaseFileName=".\Static_Release/"
WarningLevel="0"
SuppressStartupBanner="true"
/>
@@ -68,9 +65,8 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libshout.lib"
+ OutputFile="$(OutDir)/libshout.lib"
SuppressStartupBanner="true"
- IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
@@ -80,8 +76,6 @@
/>
<Tool
Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile="$(ConfigurationName)/libshout.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -95,8 +89,6 @@
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
@@ -122,10 +114,9 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/libshout.pch"
- AssemblerListingLocation="$(ConfigurationName)"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName="$(ConfigurationName)"
+ AssemblerListingLocation=".\Static_Debug/"
+ ObjectFile=".\Static_Debug/"
+ ProgramDataBaseFileName=".\Static_Debug/"
WarningLevel="0"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -143,9 +134,8 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libshout.lib"
+ OutputFile="$(OutDir)/libshout.lib"
SuppressStartupBanner="true"
- IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
@@ -155,8 +145,6 @@
/>
<Tool
Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile="$(ConfigurationName)/libshout.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -176,24 +164,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\avl\avl.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\avl\avl.h"
@@ -202,24 +172,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.h"
@@ -228,68 +180,14 @@
<File
RelativePath="..\..\libshout-2.2.2\src\mp3.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\ogg.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\net\resolver.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\net\resolver.h"
@@ -298,24 +196,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\shout.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\shout_ogg.h"
@@ -328,24 +208,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\net\sock.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\net\sock.h"
@@ -354,24 +216,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\thread\thread.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\thread\thread.h"
@@ -380,24 +224,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\timing\timing.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\timing\timing.h"
@@ -406,24 +232,6 @@
<File
RelativePath="..\..\libshout-2.2.2\src\util.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\libshout-2.2.2\src\util.h"
More information about the Freeswitch-svn
mailing list