From f420bb46447b53837f04d2b1b46ba8168d2d6768 Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 26 Sep 2018 17:36:33 +0200 Subject: [PATCH 1/4] Fix qmake warnings: Makefile.libretroshare:3811: warning: overriding recipe for target 'temp/linux-g++/obj/hashstream.o' Makefile.libretroshare:3772: warning: ignoring old recipe for target 'temp/linux-g++/obj/hashstream.o' --- libretroshare/src/libretroshare.pro | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 4bafccec7..632f905b4 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -530,10 +530,9 @@ SOURCES += ft/ftchunkmap.cc \ ft/ftturtlefiletransferitem.cc SOURCES += crypto/chacha20.cpp \ - crypto/rsaes.cc \ - crypto/hashstream.cc\ - crypto/hashstream.cc \ - crypto/rscrypto.cpp + crypto/hashstream.cc\ + crypto/rsaes.cc \ + crypto/rscrypto.cpp SOURCES += chat/distantchat.cc \ chat/p3chatservice.cc \ From 590edb72f4645b3081b21ffe4f90d54c0c652fa3 Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 26 Sep 2018 17:44:32 +0200 Subject: [PATCH 2/4] Fix qmake warnings: Makefile.retroshare-gui:7593: warning: overriding recipe for target 'temp/moc/moc_TorProcess_p.cpp' Makefile.retroshare-gui:7572: warning: ignoring old recipe for target 'temp/moc/moc_TorProcess_p.cpp' --- retroshare-gui/src/retroshare-gui.pro | 37 +++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index e6e75db9e..b5fa1960d 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -283,25 +283,24 @@ wikipoos { # Tor controller HEADERS += TorControl/AddOnionCommand.h \ - TorControl/AuthenticateCommand.h \ - TorControl/GetConfCommand.h \ - TorControl/HiddenService.h \ - TorControl/ProtocolInfoCommand.h \ - TorControl/SetConfCommand.h \ - TorControl/TorControlCommand.h \ - TorControl/TorControl.h \ - TorControl/TorControlSocket.h \ - TorControl/TorManager.h \ - TorControl/TorProcess.h \ - TorControl/TorProcess_p.h \ - TorControl/TorSocket.h \ - TorControl/Useful.h \ - TorControl/CryptoKey.h \ - TorControl/PendingOperation.h \ - TorControl/SecureRNG.h \ - TorControl/Settings.h \ - TorControl/StrUtil.h \ - TorControl/TorProcess_p.h + TorControl/AuthenticateCommand.h \ + TorControl/CryptoKey.h \ + TorControl/GetConfCommand.h \ + TorControl/HiddenService.h \ + TorControl/PendingOperation.h \ + TorControl/ProtocolInfoCommand.h \ + TorControl/SecureRNG.h \ + TorControl/SetConfCommand.h \ + TorControl/Settings.h \ + TorControl/StrUtil.h \ + TorControl/TorControl.h \ + TorControl/TorControlCommand.h \ + TorControl/TorControlSocket.h \ + TorControl/TorManager.h \ + TorControl/TorProcess.h \ + TorControl/TorProcess_p.h \ + TorControl/TorSocket.h \ + TorControl/Useful.h SOURCES += TorControl/AddOnionCommand.cpp \ TorControl/AuthenticateCommand.cpp \ From aec68c2269cc1f6c706a6c487c0233cecfc70f80 Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 26 Sep 2018 17:55:58 +0200 Subject: [PATCH 3/4] Fix qmake double using retroshare.pri From 544b4af4c23da1c73aaef3ad357975e30562a00f --- libretroshare/src/libretroshare.pro | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 632f905b4..dc56e20c2 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -17,10 +17,6 @@ ################################################################################ !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") -TEMPLATE = lib -CONFIG += staticlib -!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") - TEMPLATE = lib CONFIG += staticlib CONFIG -= qt From a6e3273ecbb7176bf7d74d53dacadb8a83648b1c Mon Sep 17 00:00:00 2001 From: Phenom Date: Wed, 26 Sep 2018 18:02:04 +0200 Subject: [PATCH 4/4] Fix qmake double use_libretroshare.pri --- retroshare-gui/src/retroshare-gui.pro | 3 ++- retroshare-nogui/src/retroshare-nogui.pro | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index b5fa1960d..e83ad180c 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -15,6 +15,8 @@ libresapihttpserver { HEADERS *= gui/settings/WebuiPage.h SOURCES *= gui/settings/WebuiPage.cpp FORMS *= gui/settings/WebuiPage.ui +} else { + !include("../../libretroshare/src/use_libretroshare.pri"):error("Including") } rs_jsonapi { @@ -23,7 +25,6 @@ rs_jsonapi { FORMS *= gui/settings/JsonApiPage.ui } -!include("../../libretroshare/src/use_libretroshare.pri"):error("Including") FORMS += TorControl/TorControlWindow.ui SOURCES += TorControl/TorControlWindow.cpp diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 05f5e99e1..ef335e48f 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -12,9 +12,10 @@ libresapihttpserver { HEADERS += TerminalApiClient.h SOURCES += TerminalApiClient.cpp +} else { + !include("../../libretroshare/src/use_libretroshare.pri"):error("Including") } -!include("../../libretroshare/src/use_libretroshare.pri"):error("Including") ################################# Linux ##########################################