Browse Source

fixes for i2pd_qt MSYS2 mingw32

pull/1272/head
Hypnosis-mewmew 7 years ago
parent
commit
e80da3cbeb
  1. 5
      libi2pd/RouterContext.h
  2. 5
      libi2pd/RouterInfo.h
  3. 6
      qt/i2pd_qt/i2pd_qt.pro

5
libi2pd/RouterContext.h

@ -1,6 +1,11 @@
#ifndef ROUTER_CONTEXT_H__ #ifndef ROUTER_CONTEXT_H__
#define ROUTER_CONTEXT_H__ #define ROUTER_CONTEXT_H__
// i2pd_qt.pro defines this on Windows
#ifdef WINDOWS
#include <Winsock2.h>
#endif
#include <inttypes.h> #include <inttypes.h>
#include <string> #include <string>
#include <memory> #include <memory>

5
libi2pd/RouterInfo.h

@ -1,6 +1,11 @@
#ifndef ROUTER_INFO_H__ #ifndef ROUTER_INFO_H__
#define ROUTER_INFO_H__ #define ROUTER_INFO_H__
// i2pd_qt.pro defines this on Windows
#ifdef WINDOWS
#include <Winsock2.h>
#endif
#include <inttypes.h> #include <inttypes.h>
#include <string> #include <string>
#include <map> #include <map>

6
qt/i2pd_qt/i2pd_qt.pro

@ -272,6 +272,12 @@ linux:!android {
LIBS += -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -lminiupnpc 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 { !android:!symbian:!maemo5:!simulator {
message("Build with a system tray icon") message("Build with a system tray icon")
# see also http://doc.qt.io/qt-4.8/qt-desktop-systray-systray-pro.html for example on wince* # see also http://doc.qt.io/qt-4.8/qt-desktop-systray-systray-pro.html for example on wince*

Loading…
Cancel
Save