gsmopen: gsmlib compile on windows with gsmlib, new solution for gsmlib, mod_gsmopen...

diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.vcproj b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.vcproj
index 7227391d189f65de34aee2759a53e5c6e4382bec..a102fe57739e2b79c8fa222fc1224b6f510aaad7 100755 (executable)
--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.vcproj
+++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.vcproj
@@ -46,7 +46,7 @@
                                AdditionalIncludeDirectories="../vcproject,..,."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                RuntimeTypeInfo="true"\r
                                PrecompiledHeaderFile=".\Release/gsmlib.pch"\r
@@ -123,7 +123,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                RuntimeTypeInfo="true"\r
                                PrecompiledHeaderFile=".\Debug/gsmlib.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
@@ -148,6 +148,8 @@
                                Name="VCLibrarianTool"\r
                                OutputFile=".\Debug\gsmlib.lib"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreAllDefaultLibraries="false"\r
+                               IgnoreDefaultLibraryNames=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r

diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
index bf4d1e3e30ce33854ffe72d4ff15326dce972565..0bd4f78a552ea163e059f24182bf3b6ccd40ab2e 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
@@ -2,7 +2,7 @@
 #ifdef WIN32
 #include "win_iconv.c"
 #endif// WIN32
-#undef WANT_GSMLIB
+#define WANT_GSMLIB
 
 #ifdef WANT_GSMLIB
 #include <gsmlib/gsm_sms.h>
@@ -2321,7 +2321,11 @@ int ucs2_to_utf8(private_t *tech_pvt, char *ucs2_in, char *utf8_out, size_t outb
        DEBUGA_GSMOPEN("1 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
                                   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
 
+#ifdef WIN32
        iconv_res = iconv(iconv_format, (const char **)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#else// WIN32
+       iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#endif// WIN32
        if (iconv_res == (size_t) -1) {
                DEBUGA_GSMOPEN("2 ciao in=%s, inleft=%d, out=%s, outleft=%d, converted=%s, utf8_out=%s\n",
                                           GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, converted, utf8_out);
@@ -2358,7 +2362,11 @@ int utf8_to_iso_8859_1(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, c
 
        DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, iso_8859_1_out=%s\n",
                                   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, iso_8859_1_out);
+#ifdef WIN32
        iconv_res = iconv(iconv_format, (const char **)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#else// WIN32
+       iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#endif// WIN32
        if (iconv_res == (size_t) -1) {
                ERRORA("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
                return -1;
@@ -2409,7 +2417,11 @@ int iso_8859_1_to_utf8(private_t *tech_pvt, char *iso_8859_1_in, char *utf8_out,
        }
 
        inbytesleft = strlen(iso_8859_1_in) * 2;
+#ifdef WIN32
        iconv_res = iconv(iconv_format, (const char **)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#else// WIN32
+       iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#endif// WIN32
        if (iconv_res == (size_t) -1) {
                DEBUGA_GSMOPEN("ciao in=%s, inleft=%d, out=%s, outleft=%d, utf8_out=%s\n",
                                           GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_out);
@@ -2453,7 +2465,11 @@ int utf8_to_ucs2(private_t *tech_pvt, char *utf8_in, size_t inbytesleft, char *u
 
        DEBUGA_GSMOPEN("in=%s, inleft=%d, out=%s, outleft=%d, utf8_in=%s, converted=%s\n",
                                   GSMOPEN_P_LOG, inbuf, (int) inbytesleft, outbuf, (int) outbytesleft, utf8_in, converted);
+#ifdef WIN32
        iconv_res = iconv(iconv_format, (const char **)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#else// WIN32
+       iconv_res = iconv(iconv_format, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+#endif// WIN32
        if (iconv_res == (size_t) -1) {
                ERRORA("error: %s %d\n", GSMOPEN_P_LOG, strerror(errno), errno);
                return -1;

diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
index 2233a61624dc168d1939910c24b1bdbbb0996f75..6310d34e0846acbbdbe5851c4bae40e7e8b78f3e 100644 (file)
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
@@ -39,7 +39,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;libctb-0.16\include&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff&quot;"\r
+                               AdditionalIncludeDirectories="&quot;gsmlib\gsmlib-1.10-patched-13ubuntu&quot;;&quot;libctb-0.16\include&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-3.8.2\libtiff&quot;"\r
                                PreprocessorDefinitions="NO_ALSA"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
@@ -56,9 +56,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalOptions=" ctbd-0.16.lib &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\libteletone\Debug\libteletone.lib&quot; ksuser.lib &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot;&#x0D;&#x0A;rpcrt4.lib  &quot;..\..\..\..\debug\libtiff.lib&quot; &quot;..\..\..\..\libs\spandsp\src\debug\spandsp.lib&quot;"\r
+                               AdditionalOptions="gsmlib.lib ctbd-0.16.lib &quot;..\..\..\..\w32\library\debug\freeswitchcore.lib&quot; &quot;..\..\..\..\libs\libteletone\Debug\libteletone.lib&quot; ksuser.lib &quot;..\..\..\..\libs\win32\apr\debug\libapr-1.lib&quot;&#x0D;&#x0A;rpcrt4.lib  &quot;..\..\..\..\debug\libtiff.lib&quot; &quot;..\..\..\..\libs\spandsp\src\debug\spandsp.lib&quot;"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;libctb-0.16\lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;gsmlib\gsmlib-1.10-patched-13ubuntu\win32\Debug&quot;;&quot;libctb-0.16\lib&quot;"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                        />\r