mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-27 04:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial fixes to build on macOS.

Browse source
This commit is contained in:
Ryan McGrath 2020-07-06 03:37:02 -07:00 • committed by R2DLiu
commit ad66aedd04
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Common/StringUtil.cpp
View file

@ -671,9 +671,9 @@ std::string UTF16BEToUTF8(const char16_t* str, size_t max_size)
return CodeToUTF8("UTF-16BE", std::u16string_view(str, static_cast<size_t>(str_end - str))); return CodeToUTF8("UTF-16BE", std::u16string_view(str, static_cast<size_t>(str_end - str)));
} }
std::u32string UTF8ToUTF32(const std::string_view input) std::u32string UTF8ToUTF32(const std::string& input)
{ {
auto val = CodeTo("UTF-32LE", "UTF-8", input); auto val = CodeTo("UTF-32LE", "UTF-8", std::string_view(input));
auto utf32Data = (char32_t*)val.data(); auto utf32Data = (char32_t*)val.data();
return std::u32string(utf32Data, utf32Data + (val.size() / 4)); return std::u32string(utf32Data, utf32Data + (val.size() / 4));
} }
@ -682,7 +682,7 @@ std::string UTF32toUTF8(const std::u32string& input)
{ {
auto utf8Data = (char*)input.data(); auto utf8Data = (char*)input.data();
auto str = std::string(utf8Data, utf8Data + (input.size() * 4)); auto str = std::string(utf8Data, utf8Data + (input.size() * 4));
return CodeTo("UTF-8", "UTF-32LE", str); return CodeTo("UTF-8", "UTF-32LE", std::string_view(str));
} }
#endif #endif

2
Source/Core/Common/StringUtil.h
View file

@ -171,7 +171,7 @@ void StringPopBackIf(std::string* s, char c);
#ifdef _WIN32 #ifdef _WIN32
std::u32string UTF8ToUTF32(const std::string& input); std::u32string UTF8ToUTF32(const std::string& input);
#else #else
std::u32string UTF8ToUTF32(const std::string_view input); std::u32string UTF8ToUTF32(const std::string& input);
#endif #endif
std::string UTF32toUTF8(const std::u32string& input); std::string UTF32toUTF8(const std::u32string& input);
std::string ConvertStringForGame(const std::string& input, int length); std::string ConvertStringForGame(const std::string& input, int length);

2
Source/Core/Core/Slippi/SlippiPad.cpp
View file

@ -1,3 +1,5 @@
#include <memory>
#include "SlippiPad.h" #include "SlippiPad.h"
// TODO: Confirm the default and padding values are right // TODO: Confirm the default and padding values are right

7
Source/Core/UICommon/UICommon.cpp
View file

@ -298,14 +298,17 @@ void SetUserDirectory(const std::string& custom_path)
std::string home_path = std::string(home) + DIR_SEP; std::string home_path = std::string(home) + DIR_SEP;
#if defined(__APPLE__) || defined(ANDROID) #if defined(__APPLE__) || defined(ANDROID)
if (env_path) // Mainline Dolphin switched to storing things elsewhere some time ago.
// To get it working for now, let's just use the Slippi route.
/*if (env_path)
{ {
user_path = env_path; user_path = env_path;
} }
else else
{ {
user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP; user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP;
} }*/
user_path = File::GetBundleDirectory() + "/Contents/Resources/User" DIR_SEP;
#else #else
// We are on a non-Apple and non-Android POSIX system, there are 4 cases: // We are on a non-Apple and non-Android POSIX system, there are 4 cases:
// 1. GetExeDirectory()/portable.txt exists // 1. GetExeDirectory()/portable.txt exists