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

Merge pull request #2612 from PhenomRetroShare/Fix_MacOS_Build

Browse Source 
Fix MacOS build
This commit is contained in:
G10h4ck 2022-04-10 12:47:02 +02:00 committed by GitHub
commit 7521253ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -47,7 +47,9 @@
#include <QTcpSocket>
#include <QTimer>
#ifdef RS_USE_I2P_SAM3
#include <libsam3.h>
#endif
#define ICON_STATUS_UNKNOWN ":/images/ledoff1.png"
#define ICON_STATUS_WORKING ":/images/yellowled.png"
@ -1562,6 +1564,7 @@ void ServerPage::syncI2PProxyAddrSam(QString t)
void ServerPage::taskFinished(taskTicket *&ticket)
{
#ifdef RS_USE_I2P_SAM3
switch (ticket->task) {
case autoProxyTask::receiveKey:
{
@ -1629,6 +1632,7 @@ void ServerPage::taskFinished(taskTicket *&ticket)
delete ticket;
ticket = nullptr;
#endif //RS_USE_I2P_SAM3
}
void ServerPage::connectionWithoutCert()

12
retroshare.pri
View File

@ -140,6 +140,7 @@ rs_macos10.12:CONFIG -= rs_macos10.11
rs_macos10.13:CONFIG -= rs_macos10.11
rs_macos10.14:CONFIG -= rs_macos10.11
rs_macos10.15:CONFIG -= rs_macos10.11
rs_macos11.1:CONFIG -= rs_macos10.11
# To enable JSON API append the following assignation to qmake command line
# "CONFIG+=rs_jsonapi"
@ -790,6 +791,13 @@ macx-* {
QMAKE_CXXFLAGS += -Wno-nullability-completeness
QMAKE_CFLAGS += -Wno-nullability-completeness
}
rs_macos11.1 {
message(***retroshare.pri: Set Target and SDK to MacOS 11.1 )
QMAKE_MACOSX_DEPLOYMENT_TARGET=11.1
QMAKE_MAC_SDK = macosx11.1
QMAKE_CXXFLAGS += -Wno-nullability-completeness
QMAKE_CFLAGS += -Wno-nullability-completeness
}
@ -798,6 +806,10 @@ macx-* {
INCLUDEPATH += "/usr/local/include"
RS_UPNP_LIB = miniupnpc
QT += macextras
INCLUDEPATH += "/usr/local/opt/openssl/include"
QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
}
# If not yet defined attempt UPnP library autodetection should works at least