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

Common folders for libraries, includes and binaries of all external libraries for Windows compile.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-10-05 15:30:15 +00:00
parent 17b6b5f16e
commit 6d44fe8e38
8 changed files with 20 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build_scripts/Windows/retroshare.nsi
View file

@ -176,12 +176,12 @@ Section $(Section_Main) Section_Main
File "${QTDIR}\bin\QtXml4.dll"
; MinGW binaries
File "${MINGWDIR}\bin\mingwm10.dll"
File "${MINGWDIR}\bin\libstdc++-6.dll"
File "${MINGWDIR}\bin\libgcc_s_dw2-1.dll"
File "${MINGWDIR}\bin\pthreadGC2.dll"
File "${MINGWDIR}\bin\libwinpthread-1.dll"
; External binaries
File "${SOURCEDIR}\..\lib\bin\miniupnpc.dll"
File "${SOURCEDIR}\..\libs\bin\miniupnpc.dll"
; Other files
File "${SOURCEDIR}\retroshare-gui\src\changelog.txt"

15
libretroshare/src/libretroshare.pro
View file

@ -253,19 +253,10 @@ win32 {
CONFIG += upnp_miniupnpc
UPNPC_DIR = ../../../miniupnpc-1.3
LIBS_DIR = $$PWD/../../../libs
OPENPGPSDK_DIR = $$PWD/../../openpgpsdk/src
ZLIB_DIR = ../../../zlib-1.2.3
SSL_DIR = ../../../openssl-1.0.1h
OPENPGPSDK_DIR = ../../openpgpsdk/src
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR}
# SQLite include path is required to compile GXS.
gxs {
SQLITE_DIR = ../../../sqlcipher-2.2.0
INCLUDEPATH += $${SQLITE_DIR}
}
INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc $$OPENPGPSDK_DIR
}
################################# MacOSX ##########################################

6
openpgpsdk/src/openpgpsdk.pro
View file

@ -33,11 +33,9 @@ win32 {
#QMAKE_CXXFLAGS_DEBUG += -O2
#QMAKE_CFLAGS_DEBUG += -O2
SSL_DIR = ../../../openssl-1.0.1h
ZLIB_DIR = ../../../zlib-1.2.3
BZIP_DIR = ../../../bzip2-1.0.6
LIBS_DIR = $$PWD/../../../libs
INCLUDEPATH += $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR}
INCLUDEPATH += $$LIBS_DIR/include
}
# Input

8
plugins/Common/retroshare_plugin.pri
View file

@ -44,15 +44,13 @@ win32 {
HEADERS += upnp/upnputil.h
SOURCES += upnp/upnputil.c
UPNPC_DIR = ../../../lib/miniupnpc-1.3
ZLIB_DIR = ../../../lib/zlib-1.2.3
SSL_DIR = ../../../openssl-1.0.1h
LIBS_DIR = $$PWD/../../../libs
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR}
INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc
PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
LIBS += -L"$$PWD/../../../lib"
LIBS += -L"$$LIBS_DIR/lib"
LIBS += -lpthread
}

6
plugins/FeedReader/FeedReader.pro
View file

@ -90,12 +90,6 @@ linux-* {
win32 {
DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC
CURL_DIR = ../../../curl-7.34.0
LIBXML2_DIR = ../../../libxml2-2.9.1
LIBXSLT_DIR = ../../../libxslt-1.1.28
INCLUDEPATH += $${CURL_DIR}/include $${LIBXML2_DIR}/include $${LIBXSLT_DIR} $${LIBICONV_DIR}/include
# Change order of the libraries
LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 -lwsock32 $${LIBS}
}

5
plugins/VOIP/VOIP.pro
View file

@ -17,11 +17,6 @@ INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
#################################### Windows #####################################
win32 {
# Speex
INCLUDEPATH += ../../../speex-1.2rc1/include
}
QMAKE_CXXFLAGS *= -Wall
SOURCES = services/p3vors.cc \

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

@ -154,9 +154,11 @@ win32 {
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
LIBS_DIR = $$PWD/../../../libs
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"$$PWD/../../../lib"
LIBS += -L"$$LIBS_DIR/lib"
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a

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

@ -76,24 +76,24 @@ win32 {
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
LIBS_DIR = $$PWD/../../../libs
LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"$$PWD/../../../lib"
LIBS += -L"$$LIBS_DIR/lib"
LIBS += -lssl -lcrypto -lminiupnpc -lz
# added after bitdht
# LIBS += -lcrypto -lws2_32 -lgdi32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin
LIBS += -lole32 -lwinmm
PROTOCPATH=$$PWD/../../../lib/bin/
PROTOCPATH=$$LIBS_DIR/bin/
RC_FILE = resources/retroshare_win.rc
DEFINES *= WINDOWS_SYS _USE_32BIT_TIME_T
SSL_DIR = ../../../openssl-1.0.1h
INCLUDEPATH += . $${SSL_DIR}/include
INCLUDEPATH += . $$LIBS_DIR/include
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
@ -320,8 +320,7 @@ protorpc {
LIBS += -lprotobuf -lpthread
win32 {
PROTOPATH = ../../../protobuf-2.4.1
INCLUDEPATH += . $${PROTOPATH}/src
INCLUDEPATH += $$LIBS_DIR/include/protobuf
}
}
win32 {