Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Windows compile of VOIP

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-15 21:12:10 +00:00
parent 5df440b1bb
commit 6dace62abe
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/VOIP/VOIP.pro
View file

@ -14,13 +14,22 @@ CONFIG += qt uic qrc resources
MOBILITY = multimedia MOBILITY = multimedia
INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
INCLUDEPATH += /usr/include/opencv
#################################### Windows ##################################### #################################### Windows #####################################
linux-* {
INCLUDEPATH += /usr/include
LIBS += -lopencv_core -lopencv_highgui
}
win32 { win32 {
# Speex SPEEX_DIR = ../../../speex-1.2rc1
INCLUDEPATH += ../../../speex-1.2rc1/include OPENCV_DIR = ../../../lib/opencv
INCLUDEPATH += $${SPEEX_DIR}/include $${OPENCV_DIR}/include
LIBS += -L"$$OPENCV_DIR/x86/mingw/staticlib"
LIBS += -lopencv_core249 -lopencv_highgui249 -llibjpeg -llibtiff -llibpng -llibjasper -lIlmImf -lole32 -loleaut32 -luuid -lavicap32 -lavifil32 -lvfw32
} }
QMAKE_CXXFLAGS *= -Wall QMAKE_CXXFLAGS *= -Wall
@ -86,4 +95,4 @@ TRANSLATIONS += \
lang/VOIP_tr.ts \ lang/VOIP_tr.ts \
lang/VOIP_zh_CN.ts lang/VOIP_zh_CN.ts
LIBS += -lspeex -lspeexdsp -lopencv_core -lopencv_highgui LIBS += -lspeex -lspeexdsp

4
plugins/VOIP/gui/QVideoDevice.cpp
View file

@ -1,5 +1,5 @@
#include <cv.h> #include <opencv/cv.h>
#include <highgui.h> #include <opencv/highgui.h>
#include <QTimer> #include <QTimer>
#include <QPainter> #include <QPainter>