msvc build.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7647 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/voipcodecs/libvoipcodecs.vcproj b/libs/voipcodecs/libvoipcodecs.vcproj
index 21aa075958d1cd42d62f00e5d233d39c15636dfc..1ab75ee53e95a32066e1c849eb10d06474858f1f 100644 (file)
--- a/libs/voipcodecs/libvoipcodecs.vcproj
+++ b/libs/voipcodecs/libvoipcodecs.vcproj
@@ -20,7 +20,7 @@
                        Name="Debug|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
+                       ConfigurationType="4"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
@@ -48,7 +48,6 @@
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
                        />\r
                        <Tool\r
@@ -61,21 +60,11 @@
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
-                               ModuleDefinitionFile="src/msvc/voipcodecs.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               Name="VCLibrarianTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -85,9 +74,6 @@
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -96,7 +82,7 @@
                        Name="Release|Win32"\r
                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
+                       ConfigurationType="4"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
@@ -122,7 +108,6 @@
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
@@ -135,23 +120,11 @@
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="src/msvc/voipcodecs.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               Name="VCLibrarianTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
@@ -161,9 +134,6 @@
                        <Tool\r
                                Name="VCFxCopTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r

diff --git a/libs/voipcodecs/src/voipcodecs/dc_restore.h b/libs/voipcodecs/src/voipcodecs/dc_restore.h
index 7846f37f4640a8e9baec2602a0d42dc846b09a00..4b65b9d77c317fda242e523ba948e58c1b33fe3a 100644 (file)
--- a/libs/voipcodecs/src/voipcodecs/dc_restore.h
+++ b/libs/voipcodecs/src/voipcodecs/dc_restore.h
@@ -99,6 +99,35 @@ static __inline__ int16_t saturate(int32_t amp)
 }
 /*- End of function --------------------------------------------------------*/
 
+#ifdef _MSC_VER
+__inline float rintf (float flt)\r
+{\r
+       _asm\r
+       {       fld flt\r
+               frndint\r
+       }\r
+}\r
+\r
+__inline double rint(double dbl)\r
+{\r
+    __asm \r
+       {\r
+        fld dbl\r
+        frndint\r
+    }\r
+}\r
+\r
+__inline long lrintf (float flt)\r
+{\r
+       long retval;\r
+       _asm\r
+       {       fld flt\r
+               fistp retval\r
+       }\r
+       return retval;\r
+}
+#endif
+
 static __inline__ int16_t fsaturatef(float famp)
 {
     if (famp > 32767.0)