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

diff --git a/libs/win32/libmp3lame/config.h b/libs/win32/libmp3lame/config.h
new file mode 100644 (file)
index 0000000..67e88fe
--- /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 <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

diff --git a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj
index eec3ea2cbbeb82deebd33e5e98c0779d7844b347..17f5c4e119937043753e8258886ca74c3e2ba99d 100644 (file)
--- a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj
+++ b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/GAy /QIfdiv /QI0f"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=""..\..\lame-3.97","..\..\lame-3.97\include""\r
+                               AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include""\r
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -112,7 +112,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;..\..\lame-3.97&quot;,&quot;..\..\lame-3.97\include&quot;"\r
+                               AdditionalIncludeDirectories=".;&quot;..\..\lame-3.97&quot;;&quot;..\..\lame-3.97\include&quot;"\r
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\Debug/libmp3lame_vc6.pch"\r
@@ -654,30 +654,6 @@
                                RelativePath="..\..\lame-3.97\libmp3lame\bitstream.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\lame-3.97\configMS.h"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Performing Custom Build Step on $(InputName)"\r
-                                               CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h&#x0D;&#x0A;"\r
-                                               Outputs="..\config.h"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Performing Custom Build Step on $(InputName)"\r
-                                               CommandLine="copy ..\..\lame-3.97\configMS.h ..\..\lame-3.97\config.h&#x0D;&#x0A;"\r
-                                               Outputs="..\config.h"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\lame-3.97\libmp3lame\encoder.h"\r
                                >\r

diff --git a/libs/win32/libshout/libshout.vcproj b/libs/win32/libshout/libshout.vcproj
index 6af0060fb775d0a0c422e71b9114edd0bd6fb23c..7d0c65b2fe4323dc58247ae0101dc39db1610284 100644 (file)
--- a/libs/win32/libshout/libshout.vcproj
+++ b/libs/win32/libshout/libshout.vcproj
@@ -20,8 +20,6 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -44,14 +42,13 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                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"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32;VERSION=\&quot;2.0.0\&quot;;LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_WIN32;VERSION=\&quot;2.0.0\&quot;;LIBSHOUT_MAJOR=2;LIBSHOUT_MINOR=0;LIBSHOUT_MICRO=0;HAVE_WINSOCK2_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile="$(ConfigurationName)/libshout.pch"\r
-                               AssemblerListingLocation=".$(ConfigurationName)"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName="$(ConfigurationName)"\r
+                               AssemblerListingLocation=".\Static_Release/"\r
+                               ObjectFile=".\Static_Release/"\r
+                               ProgramDataBaseFileName=".\Static_Release/"\r
                                WarningLevel="0"\r
                                SuppressStartupBanner="true"\r
                        />\r
@@ -68,9 +65,8 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)\libshout.lib"\r
+                               OutputFile="$(OutDir)/libshout.lib"\r
                                SuppressStartupBanner="true"\r
-                               IgnoreAllDefaultLibraries="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -80,8 +76,6 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
-                               OutputFile="$(ConfigurationName)/libshout.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -95,8 +89,6 @@
                        OutputDirectory="$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -122,10 +114,9 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug/libshout.pch"\r
-                               AssemblerListingLocation="$(ConfigurationName)"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName="$(ConfigurationName)"\r
+                               AssemblerListingLocation=".\Static_Debug/"\r
+                               ObjectFile=".\Static_Debug/"\r
+                               ProgramDataBaseFileName=".\Static_Debug/"\r
                                WarningLevel="0"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -143,9 +134,8 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)\libshout.lib"\r
+                               OutputFile="$(OutDir)/libshout.lib"\r
                                SuppressStartupBanner="true"\r
-                               IgnoreAllDefaultLibraries="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -155,8 +145,6 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
-                               OutputFile="$(ConfigurationName)/libshout.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -176,24 +164,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\avl\avl.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\avl\avl.h"\r
@@ -202,24 +172,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\httpp\httpp.h"\r
@@ -228,68 +180,14 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\mp3.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\ogg.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\net\resolver.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\net\resolver.h"\r
@@ -298,24 +196,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\shout.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\shout_ogg.h"\r
@@ -328,24 +208,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\net\sock.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\net\sock.h"\r
@@ -354,24 +216,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\thread\thread.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\thread\thread.h"\r
@@ -380,24 +224,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\timing\timing.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\timing\timing.h"\r
@@ -406,24 +232,6 @@
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\util.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\libshout-2.2.2\src\util.h"\r