Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 10:46:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #96 from AsamK/qmake_3

Browse source 
Qmake: Use PKGCONFIG and reduce duplicate code in .pro files
This commit is contained in:
Cyril Soler 2015-09-07 20:38:47 -04:00
commit da417eede9
11 changed files with 65 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Common/retroshare_plugin.pri
View file

@ -7,7 +7,7 @@ DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
unix {
target.path = "$${LIB_DIR}/retroshare/extensions6"
target.path = "$${PLUGIN_DIR}"
INSTALLS += target
}

8
plugins/FeedReader/FeedReader.pro
View file

@ -81,12 +81,9 @@ TRANSLATIONS += \
lang/FeedReader_zh_CN.ts
linux-* {
LIBXML2_DIR = /usr/include/libxml2
CONFIG += link_pkgconfig
DEPENDPATH += $${LIBXML2_DIR}
INCLUDEPATH += $${LIBXML2_DIR}
LIBS += -lcurl -lxml2 -lxslt
PKGCONFIG *= libcurl libxml-2.0 libxslt
}
win32 {
@ -102,4 +99,3 @@ openbsd-* {
LIBS += -lcurl -lxml2 -lxslt
}

7
plugins/VOIP/VOIP.pro
View file

@ -21,10 +21,11 @@ INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
linux-* {
CONFIG += link_pkgconfig
# Necessary for openSUSE
PKGCONFIG += libavcodec libavutil
PKGCONFIG += speex speexdsp
PKGCONFIG += opencv
} else {
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
}
win32 {
@ -103,5 +104,3 @@ TRANSLATIONS += \
lang/VOIP_sv.ts \
lang/VOIP_tr.ts \
lang/VOIP_zh_CN.ts
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil