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

Remove miniupnp and add libupnp code

Browse source 
Conflicts:

	libretroshare/src/libretroshare.pro

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:33:40 +00:00
parent b6c2b6897a
commit 4fe1bd8801
8 changed files with 2426 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/RetroShare.pro
View file

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools debug pluginmgr newsettings #release
CONFIG += qt gui uic qrc resources uitools debug pluginmgr newsettings #release
QT += network xml script
TEMPLATE = app
TARGET = RetroShare
@ -13,15 +13,16 @@ MOC_DIR = temp/moc
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
QMAKE_LFLAGS += -L"../../../../lib/linux-g++"
CONFIG += version_detail_bash_script
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lgpgme -lpthread -lminiupnpc -lz
CONFIG += version_detail_bash_script
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lcrypto -lgpgme -lpthread -lz -lupnp
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
QMAKE_LFLAGS += -L"../../../../lib/linux-g++-64"
CONFIG += version_detail_bash_script
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lgpgme -lpthread -lminiupnpc -lz
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lssl -lcrypto -lgpgme -lpthread -lz -lupnp
}
version_detail_bash_script {