mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some Android compilation errors

Browse source 
There is a linking error with SliderCalcRatioFromValueT in
OnScreenDisplay.cpp left that I didn't manage to fix.
This commit is contained in:
JosJuice 2020-07-17 23:51:37 +02:00
commit 571fa77be4
5 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -513,7 +513,7 @@ endif()
if(SLIPPI_PLAYBACK) if(SLIPPI_PLAYBACK)
# Slippi Playback build option # Slippi Playback build option
add_compile_definitions(IS_PLAYBACK) add_definitions(-DIS_PLAYBACK=1)
endif() endif()
######################################## ########################################

12
Source/Android/jni/MainAndroid.cpp
View file

@ -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*/) static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common::MsgType /*style*/)
{ {
JNIEnv* env = IDCache::GetEnvForThread(); JNIEnv* env = IDCache::GetEnvForThread();

2
Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View file

@ -359,7 +359,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction inst)
for (auto &it : callstack) for (auto &it : callstack)
msg.append(it.Name); msg.append(it.Name);
ASSERT_MSG(POWERPC, 0, msg.c_str()); ASSERT_MSG(POWERPC, 0, "%s", msg.c_str());
} }
void Interpreter::ClearCache() void Interpreter::ClearCache()

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

@ -297,18 +297,19 @@ void SetUserDirectory(const std::string& custom_path)
home = ""; home = "";
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__)
// Mainline Dolphin switched to storing things elsewhere some time ago. // Mainline Dolphin switched to storing things elsewhere some time ago.
// To get it working for now, let's just use the Slippi route. // 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; 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

3
Source/Core/VideoCommon/OnScreenDisplay.cpp
View file

@ -24,6 +24,7 @@
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#endif #endif
#include <imgui_internal.h> #include <imgui_internal.h>
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Host.h" #include "Core/Host.h"
@ -472,7 +473,7 @@ void DrawSlippiPlaybackControls()
auto playbackTime = GetTimeForFrame(g_playbackStatus->currentPlaybackFrame); auto playbackTime = GetTimeForFrame(g_playbackStatus->currentPlaybackFrame);
auto endTime = GetTimeForFrame(g_playbackStatus->lastFrame); auto endTime = GetTimeForFrame(g_playbackStatus->lastFrame);
auto timeString = playbackTime + " / " + endTime; auto timeString = playbackTime + " / " + endTime;
ImGui::Text(timeString.c_str()); ImGui::Text("%s", timeString.c_str());
} }
ImGui::End(); ImGui::End();
} }