From c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Mon, 1 Aug 2016 15:13:35 -0600
Subject: Add mingw compile support

---
 src/citra_qt/main.cpp        | 4 ++++
 src/common/string_util.cpp   | 5 +++--
 src/core/gdbstub/gdbstub.cpp | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index b904fec16..99cc3f096 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -48,6 +48,10 @@
 #include "qhexedit.h"
 #include "video_core/video_core.h"
 
+#ifdef QT_STATICPLUGIN
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
+#endif
+
 GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
     Pica::g_debug_context = Pica::DebugContext::Construct();
 
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 596ae01bf..df1008180 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -11,7 +11,8 @@
 #include "common/common_paths.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#ifdef _MSC_VER
+
+#ifdef _WIN32
 #include <codecvt>
 #include <Windows.h>
 #include "common/common_funcs.h"
@@ -270,7 +271,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
     return result;
 }
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 std::string UTF16ToUTF8(const std::u16string& input) {
 #if _MSC_VER >= 1900
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index ceb993ea1..aea43e92b 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -14,7 +14,7 @@
 #include <numeric>
 #include <fcntl.h>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #include <WinSock2.h>
 #include <common/x64/abi.h>
 #include <io.h>
-- 
cgit v1.2.3