diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e84d8a30d..230670fdec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,7 +513,7 @@ endif() if(SLIPPI_PLAYBACK) # Slippi Playback build option - add_compile_definitions(IS_PLAYBACK) + add_definitions(-DIS_PLAYBACK=1) endif() ######################################## diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 4b7a404086..eb15c67604 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -145,6 +145,18 @@ void Host_TitleChanged() { } +void Host_LowerWindow() +{ +} + +void Host_Exit() +{ +} + +void Host_PlaybackSeek() +{ +} + static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common::MsgType /*style*/) { JNIEnv* env = IDCache::GetEnvForThread(); diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp index ed92058bd8..ea7d0886bf 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp @@ -359,7 +359,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction inst) for (auto &it : callstack) msg.append(it.Name); - ASSERT_MSG(POWERPC, 0, msg.c_str()); + ASSERT_MSG(POWERPC, 0, "%s", msg.c_str()); } void Interpreter::ClearCache() diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 3528288e28..192795eeae 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -297,18 +297,19 @@ void SetUserDirectory(const std::string& custom_path) home = ""; std::string home_path = std::string(home) + DIR_SEP; -#if defined(__APPLE__) || defined(ANDROID) +#if defined(__APPLE__) // 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 = File::GetBundleDirectory() + "/Contents/Resources/User" DIR_SEP; +#elif defined(ANDROID) + if (env_path) { user_path = env_path; } else { user_path = home_path + DOLPHIN_DATA_DIR DIR_SEP; - }*/ - user_path = File::GetBundleDirectory() + "/Contents/Resources/User" DIR_SEP; + } #else // We are on a non-Apple and non-Android POSIX system, there are 4 cases: // 1. GetExeDirectory()/portable.txt exists diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 00ab7aec9d..ff4b7ccd7e 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -24,6 +24,7 @@ #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif + #include #include "Core/Core.h" #include "Core/Host.h" @@ -472,7 +473,7 @@ void DrawSlippiPlaybackControls() auto playbackTime = GetTimeForFrame(g_playbackStatus->currentPlaybackFrame); auto endTime = GetTimeForFrame(g_playbackStatus->lastFrame); auto timeString = playbackTime + " / " + endTime; - ImGui::Text(timeString.c_str()); + ImGui::Text("%s", timeString.c_str()); } ImGui::End(); }