Browse Source

random fixes

eden-orbis-ps4
lizzie 3 months ago
parent
commit
9c91458fc6
  1. 2
      .ci/ps4/build.sh
  2. 4
      src/input_common/main.cpp
  3. 7
      src/yuzu_cmd/yuzu.cpp

2
.ci/ps4/build.sh

@ -37,7 +37,7 @@ EOF
# Normally a platform has a package manager
# PS4 does not, atleast not in the normal sense
export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
cmake -S . -B build -G "Unix Makefiles" \
[ -f "build/Makefile" ] || cmake -S . -B build -G "Unix Makefiles" \
-DCMAKE_TOOLCHAIN_FILE="ps4-toolchain.cmake" \
-DENABLE_QT_TRANSLATION=OFF \
-DENABLE_CUBEB=OFF \

4
src/input_common/main.cpp

@ -160,6 +160,7 @@ struct InputSubsystem::Impl {
#ifndef __OPENORBIS__
auto udp_devices = udp_client->GetInputDevices();
devices.insert(devices.end(), udp_devices.begin(), udp_devices.end());
#endif
#ifdef HAVE_SDL3
auto joycon_devices = joycon->GetInputDevices();
devices.insert(devices.end(), joycon_devices.begin(), joycon_devices.end());
@ -196,6 +197,7 @@ struct InputSubsystem::Impl {
if (engine == udp_client->GetEngineName()) {
return udp_client;
}
#endif
#ifdef HAVE_SDL3
if (engine == sdl->GetEngineName()) {
return sdl;
@ -311,6 +313,7 @@ struct InputSubsystem::Impl {
#endif
#ifndef __OPENORBIS__
udp_client->BeginConfiguration();
#endif
#ifdef HAVE_SDL3
sdl->BeginConfiguration();
joycon->BeginConfiguration();
@ -328,6 +331,7 @@ struct InputSubsystem::Impl {
#endif
#ifndef __OPENORBIS__
udp_client->EndConfiguration();
#endif
#ifdef HAVE_SDL3
sdl->EndConfiguration();
joycon->EndConfiguration();

7
src/yuzu_cmd/yuzu.cpp

@ -237,6 +237,13 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
std::optional<std::string> log_filter{};
u16 port = Network::DefaultRoomPort;
// Platforms that start with fullscreen
#if defined(__OPENORBIS__) || defined(__ANDROID__)
bool fullscreen = true;
#else
bool fullscreen = false;
#endif
static struct option long_options[] = {
// clang-format off
{"debug", no_argument, 0, 'd'},

Loading…
Cancel
Save