diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_funcs.h | 6 | ||||
| -rw-r--r-- | src/common/log.h | 4 | ||||
| -rw-r--r-- | src/common/log_manager.cpp | 1 | ||||
| -rw-r--r-- | src/common/string_util.cpp | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 1139dc3b8..db041780a 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -4,6 +4,8 @@ #pragma once +#include "common_types.h" + #ifdef _WIN32 #define SLEEP(x) Sleep(x) #else @@ -37,6 +39,8 @@ template<> struct CompileTimeAssert<true> {}; #include <sys/endian.h> #endif +#include "common_types.h" + // go to debugger mode #ifdef GEKKO #define Crash() @@ -73,6 +77,8 @@ inline u64 _rotr64(u64 x, unsigned int shift){ } #else // WIN32 +#include <locale.h> + // Function Cross-Compatibility #define strcasecmp _stricmp #define strncasecmp _strnicmp diff --git a/src/common/log.h b/src/common/log.h index 14ad98c08..78f0dae4d 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -4,6 +4,9 @@ #pragma once +#include "common/common_funcs.h" +#include "common/msg_handler.h" + #ifndef LOGGING #define LOGGING #endif @@ -62,7 +65,6 @@ enum LOG_TYPE { WII_IPC_HID, KERNEL, SVC, - NDMA, HLE, RENDER, GPU, diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 39b1924c7..128c15388 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -68,7 +68,6 @@ LogManager::LogManager() m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); m_Log[LogTypes::GPU] = new LogContainer("GPU", "GPU"); m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE"); - m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 2ec4c8e05..7a8274a91 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -528,7 +528,7 @@ std::u16string UTF8ToUTF16(const std::string& input) { std::u16string result; - iconv_t const conv_desc = iconv_open("UTF-16", "UTF-8"); + iconv_t const conv_desc = iconv_open("UTF-16LE", "UTF-8"); if ((iconv_t)(-1) == conv_desc) { ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno)); @@ -582,7 +582,7 @@ std::u16string UTF8ToUTF16(const std::string& input) std::string UTF16ToUTF8(const std::u16string& input) { - return CodeToUTF8("UTF-16", input); + return CodeToUTF8("UTF-16LE", input); } std::string CP1252ToUTF8(const std::string& input) |