diff options
| author | bunnei <bunneidev@gmail.com> | 2016-11-16 02:07:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 02:07:23 +0100 |
| commit | fb13bfe693e9536df700b675fef3affe09622fdd (patch) | |
| tree | 133bc7a610f8ae94a5381f8c8aaba6a6050d7ac1 /src | |
| parent | Merge pull request #1753 from jroweboy/frame_layouts (diff) | |
| parent | Add mingw compile support (diff) | |
| download | yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.gz yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.bz2 yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.lz yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.xz yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.zst yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/main.cpp | 4 | ||||
| -rw-r--r-- | src/common/string_util.cpp | 5 | ||||
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index bcf2a706f..0bf9f48d6 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> |