fixes for i2pd_qt MSYS2 mingw32

7 years ago · e80da3cbeb
3 changed files with 18 additions and 2 deletions
--- a/libi2pd/RouterContext.h
+++ b/libi2pd/RouterContext.h
@ -1,6 +1,11 @@
				@@ -1,6 +1,11 @@
 #ifndef ROUTER_CONTEXT_H__
 #define ROUTER_CONTEXT_H__

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

+// i2pd_qt.pro defines this on Windows
+#ifdef WINDOWS
+#include <Winsock2.h>
+#endif
+
 #include <inttypes.h>
 #include <string>
 #include <map>
--- a/qt/i2pd_qt/i2pd_qt.pro
+++ b/qt/i2pd_qt/i2pd_qt.pro
@ -272,6 +272,12 @@ linux:!android {
				@@ -272,6 +272,12 @@ linux:!android {
        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 {
 	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*