Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-11 23:49:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.

Browse Source 
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-03 16:23:02 +00:00
parent 27041aa1a6
commit bf9270dd54
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/libretroshare.pro
View File

@ -225,12 +225,11 @@ win32 {
UPNPC_DIR = ../../../miniupnpc-1.3 UPNPC_DIR = ../../../miniupnpc-1.3
PTHREADS_DIR = ../../../pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../zlib-1.2.3 ZLIB_DIR = ../../../zlib-1.2.3
SSL_DIR = ../../../openssl-1.0.1c SSL_DIR = ../../../openssl-1.0.1c
OPENPGPSDK_DIR = ../../openpgpsdk/src OPENPGPSDK_DIR = ../../openpgpsdk/src
INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR} INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR}
# SQLite include path is required to compile GXS. # SQLite include path is required to compile GXS.
gxs { gxs {

3
plugins/Common/retroshare_plugin.pri
View File

@ -43,7 +43,6 @@ win32 {
SOURCES += upnp/upnputil.c SOURCES += upnp/upnputil.c
UPNPC_DIR = ../../../lib/miniupnpc-1.3 UPNPC_DIR = ../../../lib/miniupnpc-1.3
PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release
ZLIB_DIR = ../../../lib/zlib-1.2.3 ZLIB_DIR = ../../../lib/zlib-1.2.3
SSL_DIR = ../../../openssl-1.0.1c SSL_DIR = ../../../openssl-1.0.1c
@ -53,7 +52,7 @@ win32 {
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
LIBS += -L"$$PWD/../../../lib" LIBS += -L"$$PWD/../../../lib"
LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
# added after bitdht # added after bitdht
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -157,7 +157,7 @@ win32 {
LIBS += -lsqlcipher LIBS += -lsqlcipher
} }
LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
# added after bitdht # added after bitdht
# LIBS += -lws2_32 # LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32

4
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -77,8 +77,8 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"$$PWD/../../../lib" -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -L"$$PWD/../../../lib"
LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lminiupnpc -lz
# added after bitdht # added after bitdht
# LIBS += -lws2_32 # LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32