From e80da3cbeba3fd37c25637409b93e9c00dc3fcbf Mon Sep 17 00:00:00 2001 From: Hypnosis-mewmew Date: Thu, 5 Apr 2018 15:40:44 +0800 Subject: [PATCH] fixes for i2pd_qt MSYS2 mingw32 --- libi2pd/RouterContext.h | 5 +++++ libi2pd/RouterInfo.h | 5 +++++ qt/i2pd_qt/i2pd_qt.pro | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libi2pd/RouterContext.h b/libi2pd/RouterContext.h index 4bd324f5..9f42b1e0 100644 --- a/libi2pd/RouterContext.h +++ b/libi2pd/RouterContext.h @@ -1,6 +1,11 @@ #ifndef ROUTER_CONTEXT_H__ #define ROUTER_CONTEXT_H__ +// i2pd_qt.pro defines this on Windows +#ifdef WINDOWS +#include +#endif + #include #include #include diff --git a/libi2pd/RouterInfo.h b/libi2pd/RouterInfo.h index 09e2c015..09db6ee8 100644 --- a/libi2pd/RouterInfo.h +++ b/libi2pd/RouterInfo.h @@ -1,6 +1,11 @@ #ifndef ROUTER_INFO_H__ #define ROUTER_INFO_H__ +// i2pd_qt.pro defines this on Windows +#ifdef WINDOWS +#include +#endif + #include #include #include diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro index a2ba4261..941dfff3 100644 --- a/qt/i2pd_qt/i2pd_qt.pro +++ b/qt/i2pd_qt/i2pd_qt.pro @@ -268,8 +268,14 @@ android { } linux:!android { - message("Using Linux settings") - LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc + message("Using Linux settings") + LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc +} + +windows:!android { + message("Using Windows settings") + DEFINES += BOOST_USE_WINDOWS_H WINDOWS + LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc } !android:!symbian:!maemo5:!simulator {