mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #91 from AsamK/fix_opensuse_compile
Fix opensuse compile
This commit is contained in:
commit
7385dd12ac
@ -19,8 +19,12 @@ INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
|
||||
#################################### Windows #####################################
|
||||
|
||||
linux-* {
|
||||
INCLUDEPATH += /usr/include
|
||||
LIBS += $$system(pkg-config --libs opencv)
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
# Necessary for openSUSE
|
||||
PKGCONFIG += libavcodec libavutil
|
||||
|
||||
PKGCONFIG += opencv
|
||||
}
|
||||
|
||||
win32 {
|
||||
@ -100,4 +104,4 @@ TRANSLATIONS += \
|
||||
lang/VOIP_tr.ts \
|
||||
lang/VOIP_zh_CN.ts
|
||||
|
||||
LIBS += -lspeex -lspeexdsp -lavformat -lavcodec -lavutil
|
||||
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
|
||||
|
@ -20,11 +20,11 @@ extern "C" {
|
||||
#include <libavcodec/avcodec.h>
|
||||
|
||||
#include <libavutil/opt.h>
|
||||
#include <libavutil/channel_layout.h>
|
||||
#include <libavutil/common.h>
|
||||
//#include <libavutil/channel_layout.h>
|
||||
//#include <libavutil/common.h>
|
||||
#include <libavutil/imgutils.h>
|
||||
#include <libavutil/mathematics.h>
|
||||
#include <libavutil/samplefmt.h>
|
||||
//#include <libavutil/mathematics.h>
|
||||
//#include <libavutil/samplefmt.h>
|
||||
}
|
||||
//#define DEBUG_MPEG_VIDEO 1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user