Merge branch 'master' of https://freeswitch.org/stash/scm/fs/freeswitch

src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj

@@ -85,7 +85,7 @@
     <Compile Include="PluginInterfaces.cs" />
     <Compile Include="PluginManager.cs" />
     <Compile Include="ScriptPluginManager.cs" />
-    <Compile Include="swig.2010.cs" />
+    <Compile Include="swig.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="XmlSearchBinding.cs" />
   </ItemGroup>

src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2012.csproj

@@ -85,7 +85,7 @@
     <Compile Include="PluginInterfaces.cs" />
     <Compile Include="PluginManager.cs" />
     <Compile Include="ScriptPluginManager.cs" />
-    <Compile Include="swig.2010.cs" />
+    <Compile Include="swig.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="XmlSearchBinding.cs" />
   </ItemGroup>

src/mod/languages/mod_managed/mod_managed.2010.vcxproj

@@ -306,7 +306,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="freeswitch_managed.cpp" />
-    <ClCompile Include="freeswitch_wrap.2010.cxx">
+    <ClCompile Include="freeswitch_wrap.cxx">
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug_CLR|x64'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release_CLR|x64'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release_CLR|Win32'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

src/mod/languages/mod_managed/mod_managed.2012.vcxproj

@@ -322,7 +322,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="freeswitch_managed.cpp" />
-    <ClCompile Include="freeswitch_wrap.2010.cxx">
+    <ClCompile Include="freeswitch_wrap.cxx">
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug_CLR|x64'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release_CLR|x64'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release_CLR|Win32'">4505;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

src/mod/languages/mod_managed/runswig.cmd

-\dev\swig135\swig.exe -I..\..\..\include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i 
+\dev\swigwin-2.0.12\swig.exe -I..\..\..\include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i 
 del swig.csx
 @ECHO OFF
 for %%X in (*.cs) do type %%X >> swig.csx