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

Merge pull request #1352 from PhenomRetroShare/Fix_Warnings

Browse Source 
Fix warnings
This commit is contained in:
csoler 2018-09-29 20:33:32 +02:00 committed by GitHub
commit 3d0ad54f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/libretroshare.pro
View File

@ -17,10 +17,6 @@
################################################################################ ################################################################################
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") !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 TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG -= qt CONFIG -= qt
@ -530,10 +526,9 @@ SOURCES += ft/ftchunkmap.cc \
ft/ftturtlefiletransferitem.cc ft/ftturtlefiletransferitem.cc
SOURCES += crypto/chacha20.cpp \ SOURCES += crypto/chacha20.cpp \
crypto/rsaes.cc \ crypto/hashstream.cc\
crypto/hashstream.cc\ crypto/rsaes.cc \
crypto/hashstream.cc \ crypto/rscrypto.cpp
crypto/rscrypto.cpp
SOURCES += chat/distantchat.cc \ SOURCES += chat/distantchat.cc \
chat/p3chatservice.cc \ chat/p3chatservice.cc \

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

@ -15,6 +15,8 @@ libresapihttpserver {
HEADERS *= gui/settings/WebuiPage.h HEADERS *= gui/settings/WebuiPage.h
SOURCES *= gui/settings/WebuiPage.cpp SOURCES *= gui/settings/WebuiPage.cpp
FORMS *= gui/settings/WebuiPage.ui FORMS *= gui/settings/WebuiPage.ui
} else {
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
} }
rs_jsonapi { rs_jsonapi {
@ -23,7 +25,6 @@ rs_jsonapi {
FORMS *= gui/settings/JsonApiPage.ui FORMS *= gui/settings/JsonApiPage.ui
} }
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
FORMS += TorControl/TorControlWindow.ui FORMS += TorControl/TorControlWindow.ui
SOURCES += TorControl/TorControlWindow.cpp SOURCES += TorControl/TorControlWindow.cpp
@ -283,25 +284,24 @@ wikipoos {
# Tor controller # Tor controller
HEADERS += TorControl/AddOnionCommand.h \ HEADERS += TorControl/AddOnionCommand.h \
TorControl/AuthenticateCommand.h \ TorControl/AuthenticateCommand.h \
TorControl/GetConfCommand.h \ TorControl/CryptoKey.h \
TorControl/HiddenService.h \ TorControl/GetConfCommand.h \
TorControl/ProtocolInfoCommand.h \ TorControl/HiddenService.h \
TorControl/SetConfCommand.h \ TorControl/PendingOperation.h \
TorControl/TorControlCommand.h \ TorControl/ProtocolInfoCommand.h \
TorControl/TorControl.h \ TorControl/SecureRNG.h \
TorControl/TorControlSocket.h \ TorControl/SetConfCommand.h \
TorControl/TorManager.h \ TorControl/Settings.h \
TorControl/TorProcess.h \ TorControl/StrUtil.h \
TorControl/TorProcess_p.h \ TorControl/TorControl.h \
TorControl/TorSocket.h \ TorControl/TorControlCommand.h \
TorControl/Useful.h \ TorControl/TorControlSocket.h \
TorControl/CryptoKey.h \ TorControl/TorManager.h \
TorControl/PendingOperation.h \ TorControl/TorProcess.h \
TorControl/SecureRNG.h \ TorControl/TorProcess_p.h \
TorControl/Settings.h \ TorControl/TorSocket.h \
TorControl/StrUtil.h \ TorControl/Useful.h
TorControl/TorProcess_p.h
SOURCES += TorControl/AddOnionCommand.cpp \ SOURCES += TorControl/AddOnionCommand.cpp \
TorControl/AuthenticateCommand.cpp \ TorControl/AuthenticateCommand.cpp \

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

@ -12,9 +12,10 @@ libresapihttpserver {
HEADERS += TerminalApiClient.h HEADERS += TerminalApiClient.h
SOURCES += TerminalApiClient.cpp SOURCES += TerminalApiClient.cpp
} else {
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
} }
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
################################# Linux ########################################## ################################# Linux ##########################################