mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-29 20:03:26 +00:00
random fixes
This commit is contained in:
+1
-1
@@ -37,7 +37,7 @@ EOF
|
|||||||
# Normally a platform has a package manager
|
# Normally a platform has a package manager
|
||||||
# PS4 does not, atleast not in the normal sense
|
# PS4 does not, atleast not in the normal sense
|
||||||
export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
|
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" \
|
-DCMAKE_TOOLCHAIN_FILE="ps4-toolchain.cmake" \
|
||||||
-DENABLE_QT_TRANSLATION=OFF \
|
-DENABLE_QT_TRANSLATION=OFF \
|
||||||
-DENABLE_CUBEB=OFF \
|
-DENABLE_CUBEB=OFF \
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ struct InputSubsystem::Impl {
|
|||||||
#ifndef __OPENORBIS__
|
#ifndef __OPENORBIS__
|
||||||
auto udp_devices = udp_client->GetInputDevices();
|
auto udp_devices = udp_client->GetInputDevices();
|
||||||
devices.insert(devices.end(), udp_devices.begin(), udp_devices.end());
|
devices.insert(devices.end(), udp_devices.begin(), udp_devices.end());
|
||||||
|
#endif
|
||||||
#ifdef HAVE_SDL3
|
#ifdef HAVE_SDL3
|
||||||
auto joycon_devices = joycon->GetInputDevices();
|
auto joycon_devices = joycon->GetInputDevices();
|
||||||
devices.insert(devices.end(), joycon_devices.begin(), joycon_devices.end());
|
devices.insert(devices.end(), joycon_devices.begin(), joycon_devices.end());
|
||||||
@@ -196,6 +197,7 @@ struct InputSubsystem::Impl {
|
|||||||
if (engine == udp_client->GetEngineName()) {
|
if (engine == udp_client->GetEngineName()) {
|
||||||
return udp_client;
|
return udp_client;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#ifdef HAVE_SDL3
|
#ifdef HAVE_SDL3
|
||||||
if (engine == sdl->GetEngineName()) {
|
if (engine == sdl->GetEngineName()) {
|
||||||
return sdl;
|
return sdl;
|
||||||
@@ -311,6 +313,7 @@ struct InputSubsystem::Impl {
|
|||||||
#endif
|
#endif
|
||||||
#ifndef __OPENORBIS__
|
#ifndef __OPENORBIS__
|
||||||
udp_client->BeginConfiguration();
|
udp_client->BeginConfiguration();
|
||||||
|
#endif
|
||||||
#ifdef HAVE_SDL3
|
#ifdef HAVE_SDL3
|
||||||
sdl->BeginConfiguration();
|
sdl->BeginConfiguration();
|
||||||
joycon->BeginConfiguration();
|
joycon->BeginConfiguration();
|
||||||
@@ -328,6 +331,7 @@ struct InputSubsystem::Impl {
|
|||||||
#endif
|
#endif
|
||||||
#ifndef __OPENORBIS__
|
#ifndef __OPENORBIS__
|
||||||
udp_client->EndConfiguration();
|
udp_client->EndConfiguration();
|
||||||
|
#endif
|
||||||
#ifdef HAVE_SDL3
|
#ifdef HAVE_SDL3
|
||||||
sdl->EndConfiguration();
|
sdl->EndConfiguration();
|
||||||
joycon->EndConfiguration();
|
joycon->EndConfiguration();
|
||||||
|
|||||||
@@ -240,6 +240,13 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
|
|||||||
std::optional<std::string> log_filter{};
|
std::optional<std::string> log_filter{};
|
||||||
u16 port = Network::DefaultRoomPort;
|
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[] = {
|
static struct option long_options[] = {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
{"debug", no_argument, 0, 'd'},
|
{"debug", no_argument, 0, 'd'},
|
||||||
|
|||||||
Reference in New Issue
Block a user