From fedb22d815c3fd6ce9a3e17a9efa28892cb3d0fd Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 17 Aug 2009 10:40:15 +0000
Subject: [PATCH] still many bugfixes and improvements for mingw compilation.
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@575 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
linphone/coreapi/plugins/buddylookup/Makefile.am | 15 ++++++++++++++-
linphone/linphone-deps.filelist | 1 -
linphone/mediastreamer2/src/mscommon.c | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/linphone/coreapi/plugins/buddylookup/Makefile.am b/linphone/coreapi/plugins/buddylookup/Makefile.am
index 9d1a0e8145..27ce12578b 100644
--- a/linphone/coreapi/plugins/buddylookup/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/Makefile.am
@@ -3,9 +3,18 @@ SUBDIRS=src
INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install
+INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
ZIP_EXCLUDED=include
-
+PLUGIN_DEPS_PREFIX=/usr/bin
+PLUGIN_DEPS= libsoup-2.4-1.dll \
+ libgcrypt-11.dll \
+ libgnutls-extra-26.dll \
+ libgnutlsxx-26.dll \
+ libtasn1-3.dll \
+ libgnutls-26.dll \
+ libgnutls-openssl-26.dll \
+ libgpg-error-0.dll
zip:
@@ -13,9 +22,13 @@ zip:
rm -rf $(INSTALLDIR)
mkdir -p $(INSTALLDIR)
make install DESTDIR=$(INSTALLDIR)
+ mkdir -p $(INSTALLDIR_WITH_PREFIX)/bin
+ cd $(PLUGIN_DEPS_PREFIX) && \
+ cp -f $(PLUGIN_DEPS) $(INSTALLDIR_WITH_PREFIX)/bin/.
cd $(INSTALLDIR)/$(prefix) && rm -rf $(ZIP_EXCLUDED) && \
zip -r $(ZIPFILE) *
clean-local:
rm -rf $(PACKAGE)-install
rm -f $(PACKAGE)-win32-$(VERSION).zip
+
diff --git a/linphone/linphone-deps.filelist b/linphone/linphone-deps.filelist
index 703504f3f8..7ffc5f7159 100755
--- a/linphone/linphone-deps.filelist
+++ b/linphone/linphone-deps.filelist
@@ -3,7 +3,6 @@
./bin/avutil-50.dll
./bin/exosip2.dll
./bin/libogg-0.dll
-./bin/libsoup-2.4-1.dll
./bin/libtheora-0.dll
./bin/libxml2-2.dll
./bin/osip2.dll
diff --git a/linphone/mediastreamer2/src/mscommon.c b/linphone/mediastreamer2/src/mscommon.c
index a086791c42..446b957244 100644
--- a/linphone/mediastreamer2/src/mscommon.c
+++ b/linphone/mediastreamer2/src/mscommon.c
@@ -290,12 +290,12 @@ int ms_load_plugins(const char *dir){
os_handle = LoadLibraryEx (szPluginFile, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (os_handle==NULL)
{
- ms_warning("Fail to load plugin %s: error %i",szPluginFile,GetLastError());
+ ms_message("Fail to load plugin %s with altered search path: error %i",szPluginFile,GetLastError());
os_handle = LoadLibraryEx (szPluginFile, NULL, 0);
}
if (!debug) SetErrorMode (em);
if (os_handle==NULL)
- ms_warning("Fail to load plugin %s", szPluginFile);
+ ms_error("Fail to load plugin %s", szPluginFile);
else{
init_func_t initroutine;
char szPluginName[256];
--
GitLab