Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 23:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile of VOIP plugin

Browse Source
This commit is contained in:
thunder2 2020-11-09 20:08:44 +01:00
parent 29a1b630cc
commit 95d521f692
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/VOIP/VOIP.pro
View File

@ -96,17 +96,32 @@ win32 {
USE_PRECOMPILED_LIBS = 1 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) { exists( $$lib/libopencv_videoio.dll.a) {
message(videoio found in opencv libraries.) message(videoio found in opencv libraries.)
message($$lib) message($$lib)
LIBS += -lopencv_videoio 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) { isEmpty(USE_PRECOMPILED_LIBS) {
message(Use system opencv libraries.) message(Use system opencv libraries.)
LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc 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 LIBS += -lavifil32 -lavicap32 -lavcodec -lavutil -lswresample
} }

1
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -52,6 +52,7 @@
#include "gui/chat/ChatUserNotify.h"//For BradCast #include "gui/chat/ChatUserNotify.h"//For BradCast
#include "util/DateTime.h" #include "util/DateTime.h"
#include "util/imageutil.h" #include "util/imageutil.h"
#include "gui/im_history/ImHistoryBrowser.h"
#include <retroshare/rsstatus.h> #include <retroshare/rsstatus.h>
#include <retroshare/rsidentity.h> #include <retroshare/rsidentity.h>

2
retroshare-gui/src/gui/chat/ChatWidget.h
View File

@ -27,7 +27,6 @@
#include "ChatStyle.h" #include "ChatStyle.h"
#include "gui/common/HashBox.h" #include "gui/common/HashBox.h"
#include "gui/common/RsButtonOnText.h" #include "gui/common/RsButtonOnText.h"
#include "gui/im_history/ImHistoryBrowser.h"
#include "gui/style/RSStyle.h" #include "gui/style/RSStyle.h"
#include <retroshare/rsmsgs.h> #include <retroshare/rsmsgs.h>
@ -47,6 +46,7 @@ class QTextEdit;
class QPushButton; class QPushButton;
class ChatWidget; class ChatWidget;
class QMenu; class QMenu;
class ImHistoryBrowser;
namespace Ui { namespace Ui {
class ChatWidget; class ChatWidget;