From 95d521f69258325a1151d80e7a26663cf3275439 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 9 Nov 2020 20:08:44 +0100
Subject: [PATCH] Fixed compile of VOIP plugin

---
 plugins/VOIP/VOIP.pro                      | 17 ++++++++++++++++-
 retroshare-gui/src/gui/chat/ChatWidget.cpp |  1 +
 retroshare-gui/src/gui/chat/ChatWidget.h   |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro
index c67e6c3cc..20feb82c6 100644
--- a/plugins/VOIP/VOIP.pro
+++ b/plugins/VOIP/VOIP.pro
@@ -96,17 +96,32 @@ win32 {
 				USE_PRECOMPILED_LIBS = 1
 			}
 		}
+		exists( $$lib/opencv/libopencv_videoio.a) {
+			message(videoio found in opencv libraries.)
+			message($$lib)
+			LIBS += -lopencv_videoio
+		}
 		exists( $$lib/libopencv_videoio.dll.a) {
 			message(videoio found in opencv libraries.)
 			message($$lib)
 			LIBS += -lopencv_videoio
 		}
+		exists( $$lib/opencv/libopencv_imgcodecs.a) {
+			message(videoio found in opencv libraries.)
+			message($$lib)
+			LIBS += -lopencv_imgcodecs
+		}
+		exists( $$lib/opencv/liblibwebp.a) {
+			message(videoio found in opencv libraries.)
+			message($$lib)
+			LIBS += -llibwebp
+		}
 	}
 	isEmpty(USE_PRECOMPILED_LIBS) {
 		message(Use system opencv libraries.)
 		LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc
 	}
-	LIBS += -lzlib -lole32 -loleaut32 -luuid -lvfw32 -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf
+	LIBS += -lzlib -lole32 -loleaut32 -luuid -lvfw32 -llibjpeg-turbo -llibtiff -llibpng -llibjasper -lIlmImf
 	LIBS += -lavifil32 -lavicap32 -lavcodec -lavutil -lswresample
 }
 
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index a28d0943d..52fd01ad8 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -52,6 +52,7 @@
 #include "gui/chat/ChatUserNotify.h"//For BradCast
 #include "util/DateTime.h"
 #include "util/imageutil.h"
+#include "gui/im_history/ImHistoryBrowser.h"
 
 #include <retroshare/rsstatus.h>
 #include <retroshare/rsidentity.h>
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h
index 2e64dce75..39dc88181 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.h
+++ b/retroshare-gui/src/gui/chat/ChatWidget.h
@@ -27,7 +27,6 @@
 #include "ChatStyle.h"
 #include "gui/common/HashBox.h"
 #include "gui/common/RsButtonOnText.h"
-#include "gui/im_history/ImHistoryBrowser.h"
 #include "gui/style/RSStyle.h"
 
 #include <retroshare/rsmsgs.h>
@@ -47,6 +46,7 @@ class QTextEdit;
 class QPushButton;
 class ChatWidget;
 class QMenu;
+class ImHistoryBrowser;
 
 namespace Ui {
 class ChatWidget;