Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added DEPENDPATH to pro files

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-01-12 23:14:35 +00:00
parent 8cb3ae6d2e
commit 7f58460e5f
8 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libbitdht/src/libbitdht.pro
View file

@ -102,8 +102,8 @@ openbsd-* {
################################### COMMON stuff ################################## ################################### COMMON stuff ##################################
################################### COMMON stuff ################################## ################################### COMMON stuff ##################################
#DEPENDPATH += . \ DEPENDPATH += .
INCLUDEPATH += . \ INCLUDEPATH += .
HEADERS += \ HEADERS += \
bitdht/bdiface.h \ bitdht/bdiface.h \

4
libretroshare/src/libretroshare.pro
View file

@ -76,6 +76,7 @@ SOURCES += tcponudp/udppeer.cc \
BITDHT_DIR = ../../libbitdht/src BITDHT_DIR = ../../libbitdht/src
DEPENDPATH += . $${BITDHT_DIR}
INCLUDEPATH += . $${BITDHT_DIR} INCLUDEPATH += . $${BITDHT_DIR}
# The next line is for compliance with debian packages. Keep it! # The next line is for compliance with debian packages. Keep it!
INCLUDEPATH += ../libbitdht INCLUDEPATH += ../libbitdht
@ -125,6 +126,7 @@ linux-* {
INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g") INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
OPENPGPSDK_DIR = ../../openpgpsdk/src OPENPGPSDK_DIR = ../../openpgpsdk/src
DEPENDPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
DESTDIR = lib DESTDIR = lib
@ -133,6 +135,7 @@ linux-* {
SSL_DIR = /usr/include/openssl SSL_DIR = /usr/include/openssl
UPNP_DIR = /usr/include/upnp UPNP_DIR = /usr/include/upnp
DEPENDPATH += . $${SSL_DIR} $${UPNP_DIR}
INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR} INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR}
# where to put the shared library itself # where to put the shared library itself
@ -232,6 +235,7 @@ win32 {
LIBS_DIR = $$PWD/../../../libs LIBS_DIR = $$PWD/../../../libs
OPENPGPSDK_DIR = $$PWD/../../openpgpsdk/src OPENPGPSDK_DIR = $$PWD/../../openpgpsdk/src
DEPENDPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR
INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR
} }

1
openpgpsdk/src/openpgpsdk.pro
View file

@ -35,6 +35,7 @@ win32 {
LIBS_DIR = $$PWD/../../../libs LIBS_DIR = $$PWD/../../../libs
DEPENDPATH += $$LIBS_DIR/include
INCLUDEPATH += $$LIBS_DIR/include INCLUDEPATH += $$LIBS_DIR/include
} }

1
plugins/Common/retroshare_plugin.pri
View file

@ -1,5 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/ INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
linux-g++ { linux-g++ {

1
plugins/FeedReader/FeedReader.pro
View file

@ -82,6 +82,7 @@ TRANSLATIONS += \
linux-* { linux-* {
LIBXML2_DIR = /usr/include/libxml2 LIBXML2_DIR = /usr/include/libxml2
DEPENDPATH += $${LIBXML2_DIR}
INCLUDEPATH += $${LIBXML2_DIR} INCLUDEPATH += $${LIBXML2_DIR}
LIBS += -lcurl -lxml2 -lxslt LIBS += -lcurl -lxml2 -lxslt

1
plugins/VOIP/VOIP.pro
View file

@ -13,6 +13,7 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) {
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
MOBILITY = multimedia MOBILITY = multimedia
DEPENDPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
#################################### Windows ##################################### #################################### Windows #####################################

21
retroshare-gui/src/retroshare-gui.pro
View file

@ -56,6 +56,7 @@ debug {
QMAKE_CFLAGS += -O0 QMAKE_CFLAGS += -O0
} }
DEPENDPATH *= retroshare-gui
INCLUDEPATH *= retroshare-gui INCLUDEPATH *= retroshare-gui
# treat warnings as error for better removing # treat warnings as error for better removing
@ -88,7 +89,9 @@ linux-* {
} }
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
DEPENDPATH += ../../../lib/sqlcipher/src/
INCLUDEPATH += ../../../lib/sqlcipher/src/ INCLUDEPATH += ../../../lib/sqlcipher/src/
DEPENDPATH += ../../../lib/sqlcipher/tsrc/
INCLUDEPATH += ../../../lib/sqlcipher/tsrc/ INCLUDEPATH += ../../../lib/sqlcipher/tsrc/
} else { } else {
@ -199,6 +202,7 @@ win32 {
DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
} }
@ -284,21 +288,7 @@ win32 {
LIBS += -lws2_32 LIBS += -lws2_32
} }
DEPENDPATH += . \ DEPENDPATH += . ../../libretroshare/src/
rsiface \
control \
gui \
lang \
util \
gui/bwgraph \
gui/chat \
gui/connect \
gui/images \
gui/common \
gui/toaster \
gui/help/browser \
gui/elastic
INCLUDEPATH += ../../libretroshare/src/ INCLUDEPATH += ../../libretroshare/src/
# Input # Input
@ -1082,6 +1072,7 @@ gxsphotoshare {
wikipoos { wikipoos {
DEPENDPATH += ../../supportlibs/pegmarkdown
INCLUDEPATH += ../../supportlibs/pegmarkdown INCLUDEPATH += ../../supportlibs/pegmarkdown
HEADERS += gui/WikiPoos/WikiDialog.h \ HEADERS += gui/WikiPoos/WikiDialog.h \

10
retroshare-nogui/src/retroshare-nogui.pro
View file

@ -42,6 +42,7 @@ linux-* {
} }
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
DEPENDPATH += ../../../lib/sqlcipher/src/
INCLUDEPATH += ../../../lib/sqlcipher/src/ INCLUDEPATH += ../../../lib/sqlcipher/src/
} else { } else {
LIBS += -lsqlcipher LIBS += -lsqlcipher
@ -105,7 +106,8 @@ win32 {
DEFINES *= WINDOWS_SYS _USE_32BIT_TIME_T DEFINES *= WINDOWS_SYS _USE_32BIT_TIME_T
INCLUDEPATH += . $$LIBS_DIR/include DEPENDPATH += $$LIBS_DIR/include
INCLUDEPATH += $$LIBS_DIR/include
gxs { gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
@ -178,8 +180,7 @@ bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a LIBS += ../../libbitdht/src/lib/libbitdht.a
} }
DEPENDPATH += ../../libretroshare/src DEPENDPATH += . ../../libretroshare/src
INCLUDEPATH += . ../../libretroshare/src INCLUDEPATH += . ../../libretroshare/src
# Input # Input
@ -220,6 +221,7 @@ sshserver {
DEFINES *= LIBSSH_STATIC DEFINES *= LIBSSH_STATIC
} }
DEPENDPATH += $$LIBSSH_DIR/include/
INCLUDEPATH += $$LIBSSH_DIR/include/ INCLUDEPATH += $$LIBSSH_DIR/include/
win32 { win32 {
@ -342,6 +344,7 @@ protorpc {
# ../../rsctrl/src/gencc/files.pb.cc \ # ../../rsctrl/src/gencc/files.pb.cc \
# ../../rsctrl/src/gencc/stream.pb.cc \ # ../../rsctrl/src/gencc/stream.pb.cc \
DEPENDPATH *= rpc/proto/gencc
INCLUDEPATH *= rpc/proto/gencc INCLUDEPATH *= rpc/proto/gencc
!win32 { !win32 {
@ -352,6 +355,7 @@ protorpc {
LIBS += -lprotobuf -lpthread LIBS += -lprotobuf -lpthread
win32 { win32 {
DEPENDPATH += $$LIBS_DIR/include/protobuf
INCLUDEPATH += $$LIBS_DIR/include/protobuf INCLUDEPATH += $$LIBS_DIR/include/protobuf
} }