update documentation for linphone-deps generation on windows

fix compile errors with mingw

README.mingw

@@ -125,8 +125,10 @@ These notes are useful if you want to upgrade part of the software that is inclu
 linphone-deps packages.
 
 List of software included in linphone-deps:
-libosip2  (compiled)
-libeXosip2 (compiled)
+antlr3c (compiled)
+polarssl (compiled
+belle-sip (compiled)
+libsrtp (compiled)
 libavcodec, libavutil, libavformat, libavdevice, libswscale (compiled, all these from ffmpeg)
 libtheora (from the web)
 libx264 (compiled from the version distributed from linphone's web site)
@@ -142,6 +144,45 @@ Remarks:
 For every package compiled that goes into linphone-deps, .la files (libtool files) must be removed to avoid libtool errors.
 When running "make install DESTDIR=<somepath>", somepath must be absolute and should not contain any ~ or space.
 
+- building antlr3c
+  * download the sources with:
+    $ git clone -b linphone git://git.linphone.org/antlr3.git
+  * compile and install
+    $ cd runtime/C
+    $ ./autogen.sh
+    $ ./configure --prefix=/usr --enable-shared --disable-static
+    $ make
+    $ make install
+    $ make install DESTDIR=/home/<myuser>/antlr3c-install
+    $ cp 
+
+- building polarssl
+  * download the sources with:
+    $ git clone -b linphone git://git.linphone.org/polarssl.git
+  * compile and install:
+    $ cd polarssl
+    $ make lib SHARED=1 WINDOWS=1
+    $ make install DESTDIR=/usr
+    $ make install DESTDIR=/home/<myuser>/polarssl-install
+
+- building belle-sip
+  * download the sources with:
+    $ git clone git://git.linphone.org/belle-sip.git
+  * compile and install, assuming you have already compiled polarssl and antlr3c and installed in /.
+    $ ./autogen.sh
+    $ ./configure --prefix=/usr --enable-shared --disable-static 
+    $ make && make install && make install DESTDIR=/home/<myuser>/belle-sip-install
+
+- building libsrtp
+  *  download the sources with
+    $ git clone git://git.linphone.org/srtp.git
+  * compile with 
+    $ autoconf
+    $ ./configure --prefix=/usr
+    $ make libsrtp.a
+    $ make install
+    $ make install DESTDIR=/home/<myuser>/libsrtp-install
+
 - building sqlite3
   * download the sources on the following website:
   http://www.sqlite.org/download.html (choose the sqlite-autoconf-3XXX.tar.gz)

configure.ac

@@ -408,13 +408,6 @@ AC_ARG_ENABLE(nonstandard-gsm,
 	[exotic_gsm=no]
 )
 
-
-dnl support for RSVP (by Vincent Maury)
-AC_ARG_ENABLE(rsvp,
-	[AS_HELP_STRING([--enable-rsvp], [Enable support for QoS reservations.])],
-	AC_DEFINE(VINCENT_MAURY_RSVP,1,[Tell whether RSVP support should be compiled.])
-)
-
 if test "x${prefix}" = "xNONE"; then
 	package_prefix=${ac_default_prefix}
 else
@@ -445,22 +438,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOUND_DIR, "${package_prefix}/${DATADIRNAME}/sounds/l
 dnl check if we have the getifaddrs() sytem call
 AC_CHECK_FUNCS(getifaddrs)
 
-
-dnl conditionnal build for ssl
-AC_ARG_ENABLE(ssl,
-	[AS_HELP_STRING([--enable-ssl], [Turn on ssl support compiling. Required for sip tls. (default=false)])],
-	[case "${enableval}" in
-		yes)	build_ssl=true ;;
-		no)	build_ssl=false ;;
-		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-ssl) ;;
-	esac],
-	[build_ssl=false]
-)
-
-if test "$build_ssl" = "true"; then
-	PKG_CHECK_MODULES(OPENSSL, libssl >= 0.9.8)
-fi
-
 if test "$console_ui" = "true" ; then
 	dnl check gnu readline
 	LP_CHECK_READLINE

coreapi/lpconfig.c

@@ -220,7 +220,7 @@ LpConfig * lp_config_new(const char *filename){
 
 LpConfig *lp_config_new_with_factory(const char *config_filename, const char *factory_config_filename) {
 	LpConfig *lpconfig=lp_new0(LpConfig,1);
-	struct stat fileStat;
+	
 	if (config_filename!=NULL){
 		ms_message("Using (r/w) config information from %s", config_filename);
 		lpconfig->filename=ortp_strdup(config_filename);
@@ -229,11 +229,14 @@ LpConfig *lp_config_new_with_factory(const char *config_filename, const char *fa
 			lp_config_parse(lpconfig,lpconfig->file);
 			fclose(lpconfig->file);
 #if !defined(WIN32)
-			if ((stat(config_filename,&fileStat) == 0) && (S_ISREG(fileStat.st_mode))) {
-				/* make existing configuration files non-group/world-accessible */
-				if (chmod(config_filename, S_IRUSR | S_IWUSR) == -1) {
-					ms_warning("unable to correct permissions on "
-					"configuration file: %s", strerror(errno));
+			{
+				struct stat fileStat;
+				if ((stat(config_filename,&fileStat) == 0) && (S_ISREG(fileStat.st_mode))) {
+					/* make existing configuration files non-group/world-accessible */
+					if (chmod(config_filename, S_IRUSR | S_IWUSR) == -1) {
+						ms_warning("unable to correct permissions on "
+							"configuration file: %s", strerror(errno));
+					}
 				}
 			}
 #endif /*WIN32*/

coreapi/message_storage.c

@@ -81,12 +81,12 @@ static int callback_all(void *data, int argc, char **argv, char **colName){
 	LinphoneCore* lc = (LinphoneCore*) data;
 	char* address = argv[0];
 	linphone_core_create_chat_room(lc, address);
-    return 0;
+	return 0;
 }
 
 static int callback(void *data, int argc, char **argv, char **colName){
-    create_chat_message(argv,data);
-    return 0;
+	create_chat_message(argv,data);
+	return 0;
 }
 
 void linphone_sql_request_message(sqlite3 *db,const char *stmt,LinphoneChatRoom *cr){
@@ -230,8 +230,10 @@ void linphone_create_table(sqlite3* db){
 }
 
 void linphone_message_storage_init_chat_rooms(LinphoneCore *lc) {
+	char *buf;
+	
 	if (lc->db==NULL) return;
-	char *buf=sqlite3_mprintf("SELECT remoteContact FROM history Group By remoteContact;");
+	buf=sqlite3_mprintf("SELECT remoteContact FROM history Group By remoteContact;");
 	linphone_sql_request_all(lc->db,buf,lc);
 	sqlite3_free(buf);
 }

linphone-deps.filelist

@@ -2,12 +2,12 @@
 ./bin/avutil-51.dll
 ./bin/libeay32.dll
 ./bin/ssleay32.dll
-./bin/libeXosip2-7.dll
+./bin/libbellesip-0.dll
+./bin/libantlr3c.dll
+./lib/libpolarssl.dll
 ./bin/libogg-0.dll
 ./bin/libtheora-0.dll
 ./bin/libxml2-2.dll
-./bin/libosip2-7.dll
-./bin/libosipparser2-7.dll
 ./bin/swscale-2.dll
 ./bin/libsoup-2.4-1.dll
 ./bin/libgcrypt-11.dll