Compare commits
2 commits
abd12243ec
...
7749f5c82f
Author | SHA1 | Date | |
---|---|---|---|
7749f5c82f | |||
03b4f57364 |
9 changed files with 83 additions and 56 deletions
108
externals/nx_tzdb/CMakeLists.txt
vendored
108
externals/nx_tzdb/CMakeLists.txt
vendored
|
@ -1,3 +1,6 @@
|
||||||
|
# SPDX-FileCopyrightText: 2025 Eden Emulator Project
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -15,35 +18,58 @@ find_program(DATE_PROG date)
|
||||||
|
|
||||||
set(CAN_BUILD_NX_TZDB true)
|
set(CAN_BUILD_NX_TZDB true)
|
||||||
|
|
||||||
if (NOT GIT)
|
if (NOT (GIT AND GNU_MAKE AND DATE_PROG) OR CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
|
||||||
set(CAN_BUILD_NX_TZDB false)
|
|
||||||
endif()
|
|
||||||
if (NOT GNU_MAKE)
|
|
||||||
set(CAN_BUILD_NX_TZDB false)
|
|
||||||
endif()
|
|
||||||
if (NOT DATE_PROG)
|
|
||||||
set(CAN_BUILD_NX_TZDB false)
|
|
||||||
endif()
|
|
||||||
if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
|
|
||||||
# tzdb_to_nx currently requires a posix-compliant host
|
# tzdb_to_nx currently requires a posix-compliant host
|
||||||
# MinGW and Android are handled here due to the executable format being different from the host system
|
# MinGW and Android are handled here due to the executable format being different from the host system
|
||||||
# TODO (lat9nq): cross-compiling support
|
# TODO (lat9nq): cross-compiling support
|
||||||
|
|
||||||
set(CAN_BUILD_NX_TZDB false)
|
set(CAN_BUILD_NX_TZDB false)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(NX_TZDB_VERSION "250725")
|
if (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
|
||||||
set(NX_TZDB_ROMFS_DIR "${CPM_SOURCE_CACHE}/nx_tzdb")
|
|
||||||
|
|
||||||
if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION})
|
|
||||||
message(STATUS "Downloading time zone data...")
|
|
||||||
AddJsonPackage(tzdb)
|
|
||||||
elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
|
|
||||||
# TODO(crueter): this sucked to do with cpm, see if i can get it to work again
|
|
||||||
message(FATAL_ERROR "Building tzdb is currently unsupported. Check back later.")
|
message(FATAL_ERROR "Building tzdb is currently unsupported. Check back later.")
|
||||||
add_subdirectory(tzdb_to_nx)
|
add_subdirectory(tzdb_to_nx)
|
||||||
add_dependencies(nx_tzdb x80e)
|
add_dependencies(nx_tzdb x80e)
|
||||||
|
|
||||||
set(NX_TZDB_ROMFS_DIR "${NX_TZDB_DIR}")
|
set(NX_TZDB_BASE_DIR "${NX_TZDB_DIR}")
|
||||||
|
set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# TODO(crueter): This is a terrible solution, but MSVC fails to link without it
|
||||||
|
# Need to investigate further but I still can't reproduce...
|
||||||
|
if (MSVC)
|
||||||
|
set(NX_TZDB_VERSION "250725")
|
||||||
|
set(NX_TZDB_ARCHIVE "${CPM_SOURCE_CACHE}/nx_tzdb/${NX_TZDB_VERSION}.zip")
|
||||||
|
|
||||||
|
set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb/tz")
|
||||||
|
set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
|
||||||
|
|
||||||
|
set(NX_TZDB_DOWNLOAD_URL "https://github.com/crueter/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
|
||||||
|
|
||||||
|
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
|
||||||
|
file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
|
||||||
|
STATUS NX_TZDB_DOWNLOAD_STATUS)
|
||||||
|
|
||||||
|
list(GET NX_TZDB_DOWNLOAD_STATUS 0 NX_TZDB_DOWNLOAD_STATUS_CODE)
|
||||||
|
if (NOT NX_TZDB_DOWNLOAD_STATUS_CODE EQUAL 0)
|
||||||
|
message(FATAL_ERROR "Time zone data download failed (status code ${NX_TZDB_DOWNLOAD_STATUS_CODE})")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(ARCHIVE_EXTRACT
|
||||||
|
INPUT
|
||||||
|
${NX_TZDB_ARCHIVE}
|
||||||
|
DESTINATION
|
||||||
|
${NX_TZDB_BASE_DIR})
|
||||||
|
else()
|
||||||
|
message(STATUS "Downloading time zone data...")
|
||||||
|
AddJsonPackage(tzdb)
|
||||||
|
|
||||||
|
target_include_directories(nx_tzdb
|
||||||
|
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||||
|
INTERFACE ${NX_TZDB_INCLUDE_DIR})
|
||||||
|
|
||||||
|
set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb")
|
||||||
|
set(NX_TZDB_TZ_DIR "${nx_tzdb_SOURCE_DIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(nx_tzdb
|
target_include_directories(nx_tzdb
|
||||||
|
@ -68,25 +94,25 @@ function(CreateHeader ZONE_PATH HEADER_NAME)
|
||||||
target_sources(nx_tzdb PRIVATE ${HEADER_PATH})
|
target_sources(nx_tzdb PRIVATE ${HEADER_PATH})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR} base)
|
CreateHeader(${NX_TZDB_BASE_DIR} base)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION} zoneinfo)
|
CreateHeader(${NX_TZDB_TZ_DIR} zoneinfo)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Africa africa)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Africa africa)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/America america)
|
CreateHeader(${NX_TZDB_TZ_DIR}/America america)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/America/Argentina america_argentina)
|
CreateHeader(${NX_TZDB_TZ_DIR}/America/Argentina america_argentina)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/America/Indiana america_indiana)
|
CreateHeader(${NX_TZDB_TZ_DIR}/America/Indiana america_indiana)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/America/Kentucky america_kentucky)
|
CreateHeader(${NX_TZDB_TZ_DIR}/America/Kentucky america_kentucky)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/America/North_Dakota america_north_dakota)
|
CreateHeader(${NX_TZDB_TZ_DIR}/America/North_Dakota america_north_dakota)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Antarctica antarctica)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Antarctica antarctica)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Arctic arctic)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Arctic arctic)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Asia asia)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Asia asia)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Atlantic atlantic)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Atlantic atlantic)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Australia australia)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Australia australia)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Brazil brazil)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Brazil brazil)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Canada canada)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Canada canada)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Chile chile)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Chile chile)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Etc etc)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Etc etc)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Europe europe)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Europe europe)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Indian indian)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Indian indian)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Mexico mexico)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Mexico mexico)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/Pacific pacific)
|
CreateHeader(${NX_TZDB_TZ_DIR}/Pacific pacific)
|
||||||
CreateHeader(${NX_TZDB_ROMFS_DIR}/${NX_TZDB_VERSION}/US us)
|
CreateHeader(${NX_TZDB_TZ_DIR}/US us)
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <mutex>
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
|
|
|
@ -184,7 +184,7 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
|
||||||
CheckIfParametersMet();
|
CheckIfParametersMet();
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) {
|
connect(connected_controller_checkboxes[i], &QCheckBox::checkStateChanged, [this, i](int state) {
|
||||||
player_groupboxes[i]->setChecked(state == Qt::Checked);
|
player_groupboxes[i]->setChecked(state == Qt::Checked);
|
||||||
UpdateControllerIcon(i);
|
UpdateControllerIcon(i);
|
||||||
UpdateControllerState(i);
|
UpdateControllerState(i);
|
||||||
|
|
|
@ -29,9 +29,9 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
|
||||||
connect(ui->reset_game_list_cache, &QPushButton::pressed, this,
|
connect(ui->reset_game_list_cache, &QPushButton::pressed, this,
|
||||||
&ConfigureFilesystem::ResetMetadata);
|
&ConfigureFilesystem::ResetMetadata);
|
||||||
|
|
||||||
connect(ui->gamecard_inserted, &QCheckBox::stateChanged, this,
|
connect(ui->gamecard_inserted, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureFilesystem::UpdateEnabledControls);
|
&ConfigureFilesystem::UpdateEnabledControls);
|
||||||
connect(ui->gamecard_current_game, &QCheckBox::stateChanged, this,
|
connect(ui->gamecard_current_game, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureFilesystem::UpdateEnabledControls);
|
&ConfigureFilesystem::UpdateEnabledControls);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
|
||||||
&ConfigureInput::UpdateAllInputDevices);
|
&ConfigureInput::UpdateAllInputDevices);
|
||||||
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
|
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
|
||||||
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection);
|
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection);
|
||||||
connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) {
|
connect(connected_controller_checkboxes[i], &QCheckBox::checkStateChanged, [this, i](int state) {
|
||||||
// Keep activated controllers synced with the "Connected Controllers" checkboxes
|
// Keep activated controllers synced with the "Connected Controllers" checkboxes
|
||||||
player_controllers[i]->ConnectPlayer(state == Qt::Checked);
|
player_controllers[i]->ConnectPlayer(state == Qt::Checked);
|
||||||
});
|
});
|
||||||
|
|
|
@ -74,13 +74,13 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QW
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
connect(ui->mouse_enabled, &QCheckBox::stateChanged, this,
|
connect(ui->mouse_enabled, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureInputAdvanced::UpdateUIEnabled);
|
&ConfigureInputAdvanced::UpdateUIEnabled);
|
||||||
connect(ui->debug_enabled, &QCheckBox::stateChanged, this,
|
connect(ui->debug_enabled, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureInputAdvanced::UpdateUIEnabled);
|
&ConfigureInputAdvanced::UpdateUIEnabled);
|
||||||
connect(ui->touchscreen_enabled, &QCheckBox::stateChanged, this,
|
connect(ui->touchscreen_enabled, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureInputAdvanced::UpdateUIEnabled);
|
&ConfigureInputAdvanced::UpdateUIEnabled);
|
||||||
connect(ui->enable_ring_controller, &QCheckBox::stateChanged, this,
|
connect(ui->enable_ring_controller, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureInputAdvanced::UpdateUIEnabled);
|
&ConfigureInputAdvanced::UpdateUIEnabled);
|
||||||
|
|
||||||
connect(ui->debug_configure, &QPushButton::clicked, this,
|
connect(ui->debug_configure, &QPushButton::clicked, this,
|
||||||
|
|
|
@ -83,7 +83,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_,
|
||||||
|
|
||||||
connect(combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
|
connect(combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
|
||||||
connect(combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
|
connect(combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
|
||||||
connect(checkbox_rtc, qOverload<int>(&QCheckBox::stateChanged), this, update_rtc_date);
|
connect(checkbox_rtc, &QCheckBox::checkStateChanged, this, update_rtc_date);
|
||||||
connect(date_rtc_offset, qOverload<int>(&QSpinBox::valueChanged), this, update_rtc_date);
|
connect(date_rtc_offset, qOverload<int>(&QSpinBox::valueChanged), this, update_rtc_date);
|
||||||
connect(date_rtc, &QDateTimeEdit::dateTimeChanged, this, update_date_offset);
|
connect(date_rtc, &QDateTimeEdit::dateTimeChanged, this, update_date_offset);
|
||||||
|
|
||||||
|
|
|
@ -119,11 +119,11 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
|
||||||
SetConfiguration();
|
SetConfiguration();
|
||||||
|
|
||||||
// Force game list reload if any of the relevant settings are changed.
|
// Force game list reload if any of the relevant settings are changed.
|
||||||
connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
connect(ui->show_add_ons, &QCheckBox::checkStateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
||||||
connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
connect(ui->show_compat, &QCheckBox::checkStateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
||||||
connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
connect(ui->show_size, &QCheckBox::checkStateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
||||||
connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
connect(ui->show_types, &QCheckBox::checkStateChanged, this, &ConfigureUi::RequestGameListUpdate);
|
||||||
connect(ui->show_play_time, &QCheckBox::stateChanged, this,
|
connect(ui->show_play_time, &QCheckBox::checkStateChanged, this,
|
||||||
&ConfigureUi::RequestGameListUpdate);
|
&ConfigureUi::RequestGameListUpdate);
|
||||||
connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||||
&ConfigureUi::RequestGameListUpdate);
|
&ConfigureUi::RequestGameListUpdate);
|
||||||
|
|
|
@ -697,7 +697,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
|
||||||
restore_func();
|
restore_func();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
connect(checkbox, &QCheckBox::stateChanged, reset);
|
connect(checkbox, &QCheckBox::checkStateChanged, reset);
|
||||||
reset(checkbox->checkState());
|
reset(checkbox->checkState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue