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

Add Win32 section in retroshare.pri

Browse source 
And add MSys2 directories.
This commit is contained in:
Phenom 2015-09-23 18:25:03 +02:00
parent 96597836db
commit 79d761ae2e
9 changed files with 48 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/Common/retroshare_plugin.pri
View file

@ -37,7 +37,7 @@ win32 {
UI_DIR = temp/ui
DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
DEFINES += MINIUPNPC_VERSION=13
#DEFINES += MINIUPNPC_VERSION=13
# DESTDIR = lib
# Switch off optimization for release version
@ -53,16 +53,16 @@ win32 {
DEFINES += USE_CMD_ARGS
#miniupnp implementation files
HEADERS += upnp/upnputil.h
SOURCES += upnp/upnputil.c
#HEADERS += upnp/upnputil.h
#SOURCES += upnp/upnputil.c
LIBS_DIR = $$PWD/../../../libs
INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc
DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR
PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
LIBS += -L"$$LIBS_DIR/lib"
for(lib, LIB_DIR):LIBS += -L"$$lib"
for(bin, BIN_DIR):LIBS += -L"$$bin"
LIBS += -lpthread
}

6
plugins/FeedReader/FeedReader.pro
View file

@ -91,6 +91,12 @@ win32 {
#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new'
LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
exists(C:/msys64/mingw32/include) {
message(msys2 xml2 is installed.)
INC_DIR += "C:/msys64/mingw32/include/libxml2"
}
DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR
}
openbsd-* {