From e60549f8df64a105c9fc3bb03c1df299c98c7849 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sat, 8 Jun 2019 21:15:59 +0300 Subject: [PATCH 1/3] [qt] fix build --- qt/i2pd_qt/i2pd_qt.pro | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro index e24a3963..84acaea5 100644 --- a/qt/i2pd_qt/i2pd_qt.pro +++ b/qt/i2pd_qt/i2pd_qt.pro @@ -4,19 +4,22 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = i2pd_qt TEMPLATE = app -QMAKE_CXXFLAGS *= -std=c++11 -ggdb +QMAKE_CXXFLAGS *= -std=c++11 -Wno-unused-parameter -Wno-maybe-uninitialized DEFINES += USE_UPNP SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../libi2pd/api.cpp \ ../../libi2pd/Base.cpp \ + ../../libi2pd/Blinding.cpp \ ../../libi2pd/BloomFilter.cpp \ + ../../libi2pd/Chacha20.cpp \ ../../libi2pd/Config.cpp \ ../../libi2pd/CPU.cpp \ ../../libi2pd/Crypto.cpp \ - ../../libi2pd/CryptoKey.cpp \ + ../../libi2pd/CryptoKey.cpp \ ../../libi2pd/Datagram.cpp \ ../../libi2pd/Destination.cpp \ + ../../libi2pd/Ed25519.cpp \ ../../libi2pd/Event.cpp \ ../../libi2pd/Family.cpp \ ../../libi2pd/FS.cpp \ @@ -31,7 +34,9 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../libi2pd/Log.cpp \ ../../libi2pd/NetDb.cpp \ ../../libi2pd/NetDbRequests.cpp \ + ../../libi2pd/NTCP2.cpp \ ../../libi2pd/NTCPSession.cpp \ + ../../libi2pd/Poly1305.cpp \ ../../libi2pd/Profiling.cpp \ ../../libi2pd/Reseed.cpp \ ../../libi2pd/RouterContext.cpp \ @@ -49,9 +54,6 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../libi2pd/TunnelGateway.cpp \ ../../libi2pd/TunnelPool.cpp \ ../../libi2pd/util.cpp \ - ../../libi2pd/Ed25519.cpp \ - ../../libi2pd/Chacha20.cpp \ - ../../libi2pd/Poly1305.cpp \ ../../libi2pd_client/AddressBook.cpp \ ../../libi2pd_client/BOB.cpp \ ../../libi2pd_client/ClientContext.cpp \ @@ -64,24 +66,23 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../libi2pd_client/SOCKS.cpp \ ../../libi2pd_client/Websocket.cpp \ ../../libi2pd_client/WebSocks.cpp \ + ../../daemon/Daemon.cpp \ + ../../daemon/HTTPServer.cpp \ + ../../daemon/I2PControl.cpp \ + ../../daemon/i2pd.cpp \ + ../../daemon/UnixDaemon.cpp \ + ../../daemon/UPnP.cpp \ ClientTunnelPane.cpp \ MainWindowItems.cpp \ ServerTunnelPane.cpp \ SignatureTypeComboboxFactory.cpp \ TunnelConfig.cpp \ TunnelPane.cpp \ - ../../daemon/Daemon.cpp \ - ../../daemon/HTTPServer.cpp \ - ../../daemon/i2pd.cpp \ - ../../daemon/I2PControl.cpp \ - ../../daemon/UnixDaemon.cpp \ - ../../daemon/UPnP.cpp \ textbrowsertweaked1.cpp \ pagewithbackbutton.cpp \ widgetlock.cpp \ widgetlockregistry.cpp \ logviewermanager.cpp \ - ../../libi2pd/NTCP2.cpp #qt creator does not handle this well #SOURCES += $$files(../../libi2pd/*.cpp) From 48d02f7e0910329e1dc92fdc1b8ab6aefd00ccef Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sat, 8 Jun 2019 22:24:11 +0300 Subject: [PATCH 2/3] [qt] update headers, fix ChaCha source name, remove duplicates --- qt/i2pd_qt/i2pd_qt.pro | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro index 84acaea5..46dd4a1b 100644 --- a/qt/i2pd_qt/i2pd_qt.pro +++ b/qt/i2pd_qt/i2pd_qt.pro @@ -12,7 +12,7 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../libi2pd/Base.cpp \ ../../libi2pd/Blinding.cpp \ ../../libi2pd/BloomFilter.cpp \ - ../../libi2pd/Chacha20.cpp \ + ../../libi2pd/ChaCha20.cpp \ ../../libi2pd/Config.cpp \ ../../libi2pd/CPU.cpp \ ../../libi2pd/Crypto.cpp \ @@ -90,17 +90,22 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ #SOURCES += $$files(../../daemon/*.cpp) #SOURCES += $$files(./*.cpp) -SOURCES -= ../../daemon/UnixDaemon.cpp +#SOURCES -= ../../daemon/UnixDaemon.cpp HEADERS += DaemonQT.h mainwindow.h \ ../../libi2pd/api.h \ ../../libi2pd/Base.h \ + ../../libi2pd/Blinding.h \ ../../libi2pd/BloomFilter.h \ + ../../libi2pd/ChaCha20.h \ ../../libi2pd/Config.h \ + ../../libi2pd/CPU.h \ ../../libi2pd/Crypto.h \ - ../../libi2pd/CryptoKey.h \ + ../../libi2pd/CryptoKey.h \ + ../../libi2pd/CryptoWorker.h \ ../../libi2pd/Datagram.h \ ../../libi2pd/Destination.h \ + ../../libi2pd/Ed25519.h \ ../../libi2pd/Event.h \ ../../libi2pd/Family.h \ ../../libi2pd/FS.h \ @@ -116,13 +121,16 @@ HEADERS += DaemonQT.h mainwindow.h \ ../../libi2pd/Log.h \ ../../libi2pd/NetDb.hpp \ ../../libi2pd/NetDbRequests.h \ + ../../libi2pd/NTCP2.h \ ../../libi2pd/NTCPSession.h \ + ../../libi2pd/Poly1305.h \ ../../libi2pd/Profiling.h \ ../../libi2pd/Queue.h \ ../../libi2pd/Reseed.h \ ../../libi2pd/RouterContext.h \ ../../libi2pd/RouterInfo.h \ ../../libi2pd/Signature.h \ + ../../libi2pd/Siphash.h \ ../../libi2pd/SSU.h \ ../../libi2pd/SSUData.h \ ../../libi2pd/SSUSession.h \ @@ -152,6 +160,10 @@ HEADERS += DaemonQT.h mainwindow.h \ ../../libi2pd_client/SOCKS.h \ ../../libi2pd_client/Websocket.h \ ../../libi2pd_client/WebSocks.h \ + ../../daemon/Daemon.h \ + ../../daemon/HTTPServer.h \ + ../../daemon/I2PControl.h \ + ../../daemon/UPnP.h \ ClientTunnelPane.h \ MainWindowItems.h \ ServerTunnelPane.h \ @@ -159,16 +171,11 @@ HEADERS += DaemonQT.h mainwindow.h \ TunnelConfig.h \ TunnelPane.h \ TunnelsPageUpdateListener.h \ - ../../daemon/Daemon.h \ - ../../daemon/HTTPServer.h \ - ../../daemon/I2PControl.h \ - ../../daemon/UPnP.h \ textbrowsertweaked1.h \ pagewithbackbutton.h \ widgetlock.h \ widgetlockregistry.h \ i2pd.rc \ - i2pd.rc \ logviewermanager.h INCLUDEPATH += ../../libi2pd From a74065f7758b3105afb043b81f1eefb92eaae6d5 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sun, 9 Jun 2019 01:04:43 +0300 Subject: [PATCH 3/3] [qt] dont build UnixDaemon.cpp --- qt/i2pd_qt/i2pd_qt.pro | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro index 46dd4a1b..9a978731 100644 --- a/qt/i2pd_qt/i2pd_qt.pro +++ b/qt/i2pd_qt/i2pd_qt.pro @@ -70,7 +70,6 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ ../../daemon/HTTPServer.cpp \ ../../daemon/I2PControl.cpp \ ../../daemon/i2pd.cpp \ - ../../daemon/UnixDaemon.cpp \ ../../daemon/UPnP.cpp \ ClientTunnelPane.cpp \ MainWindowItems.cpp \ @@ -82,15 +81,7 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ pagewithbackbutton.cpp \ widgetlock.cpp \ widgetlockregistry.cpp \ - logviewermanager.cpp \ - -#qt creator does not handle this well -#SOURCES += $$files(../../libi2pd/*.cpp) -#SOURCES += $$files(../../libi2pd_client/*.cpp) -#SOURCES += $$files(../../daemon/*.cpp) -#SOURCES += $$files(./*.cpp) - -#SOURCES -= ../../daemon/UnixDaemon.cpp + logviewermanager.cpp HEADERS += DaemonQT.h mainwindow.h \ ../../libi2pd/api.h \