Add mingw compile support

This commit is contained in:
James Rowe 2016-08-01 15:13:35 -06:00
parent 3b4f134c08
commit c3ea6f4ddb
5 changed files with 20 additions and 6 deletions

View file

@ -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();

View file

@ -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

View file

@ -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>