Compare commits
18 commits
8db82e55f9
...
35897434ac
Author | SHA1 | Date | |
---|---|---|---|
35897434ac | |||
340d43cbe8 | |||
db0b92dae0 | |||
d19a7c3782 | |||
c725641f13 | |||
02016697d6 | |||
c77ad128b9 | |||
cc50571275 | |||
ba20e5c2f5 | |||
020ad29a8c | |||
4982dcfaa5 | |||
677148bdca | |||
f088f028f3 | |||
19eb8272b1 | |||
86ddb51a87 | |||
10aca2f90c | |||
1d83ba733c | |||
fd21774aae |
|
@ -5,9 +5,7 @@
|
|||
|
||||
# specify full path if dupes may exist
|
||||
EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake"
|
||||
EXCLUDE_FILES=$(sed "s/ /\\\\|/g" <<< "$EXCLUDE_FILES")
|
||||
|
||||
echo $EXCLUDE_FILES
|
||||
EXCLUDE_FILES=$(echo "$EXCLUDE_FILES" | sed 's/ /|/g')
|
||||
|
||||
COPYRIGHT_YEAR="2025"
|
||||
COPYRIGHT_OWNER="Eden Emulator Project"
|
||||
|
@ -55,8 +53,8 @@ if git diff --quiet "$BASE"..HEAD; then
|
|||
echo "license-header.sh: No commits on this branch different from master."
|
||||
exit 0
|
||||
fi
|
||||
FILES=$(git diff --name-only "$BASE" | grep -v "$EXCLUDE_FILES")
|
||||
echo $FILES
|
||||
FILES=$(git diff --name-only "$BASE" | grep -E -v "$EXCLUDE_FILES")
|
||||
|
||||
echo_header() {
|
||||
COMMENT_TYPE="$1"
|
||||
echo "$COMMENT_TYPE SPDX-FileCopyrightText: Copyright $COPYRIGHT_YEAR $COPYRIGHT_OWNER"
|
||||
|
@ -142,10 +140,10 @@ cat << EOF
|
|||
other files have been reviewed and addressed.
|
||||
EOF
|
||||
|
||||
TMP_DIR=$(mktemp -d /tmp/license-header.XXXXXX) || exit 1
|
||||
TMP_DIR=$(mktemp -d "/tmp/license-header.XXXXXX") || exit 1
|
||||
if [ "$FIX" = "true" ] || [ "$UPDATE" = "true" ]; then
|
||||
echo
|
||||
echo "license-header.sh: FIX set to true, fixing headers..."
|
||||
echo "license-header.sh: FIX or UPDATE set to true, fixing headers..."
|
||||
|
||||
for file in $SRC_FILES $OTHER_FILES; do
|
||||
BASENAME=$(basename "$file")
|
||||
|
@ -165,7 +163,7 @@ if [ "$FIX" = "true" ] || [ "$UPDATE" = "true" ]; then
|
|||
TMP="$TMP_DIR/$BASENAME.tmp"
|
||||
UPDATED=0
|
||||
cp -p "$file" "$TMP"
|
||||
> "$TMP"
|
||||
: > "$TMP"
|
||||
|
||||
# this logic is bit hacky but sed don't work well with $VARIABLES
|
||||
# it's this or complete remove this logic and keep only the old way
|
||||
|
|
|
@ -147,7 +147,11 @@ if (MSVC OR ANDROID)
|
|||
set(EXT_DEFAULT ON)
|
||||
endif()
|
||||
|
||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ${EXT_DEFAULT} "ENABLE_SDL2;NOT MSVC" OFF)
|
||||
if (ENABLE_SDL2)
|
||||
# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
|
||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)
|
||||
option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
|
||||
endif()
|
||||
|
||||
cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
|
||||
|
||||
|
@ -185,8 +189,6 @@ option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ${EXT_DEFAULT})
|
|||
# TODO(crueter): CI this?
|
||||
option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
|
||||
|
||||
# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
|
||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
|
||||
|
||||
CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
|
||||
|
||||
|
@ -197,6 +199,14 @@ CMAKE_DEPENDENT_OPTION(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL
|
|||
CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
|
||||
|
||||
option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
|
||||
if(YUZU_ENABLE_LTO)
|
||||
include(CheckIPOSupported)
|
||||
check_ipo_supported(RESULT COMPILER_SUPPORTS_LTO)
|
||||
if(NOT COMPILER_SUPPORTS_LTO)
|
||||
message(FATAL_ERROR "Your compiler does not support interprocedural optimization (IPO). Re-run CMake with -DYUZU_ENABLE_LTO=OFF.")
|
||||
endif()
|
||||
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})
|
||||
endif()
|
||||
|
||||
option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
|
||||
|
||||
|
@ -310,6 +320,7 @@ endif()
|
|||
if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
|
||||
set(HAS_NCE 1)
|
||||
add_compile_definitions(HAS_NCE=1)
|
||||
find_package(oaknut 2.0.1)
|
||||
endif()
|
||||
|
||||
if (YUZU_ROOM)
|
||||
|
@ -883,19 +894,25 @@ if (MSVC AND CXX_CLANG)
|
|||
link_libraries(llvm-mingw-runtime)
|
||||
endif()
|
||||
|
||||
if (YUZU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
# We will assume that if the compiler is GCC, it will attempt to use ld.bfd by default.
|
||||
# Try to pick a faster linker.
|
||||
if (YUZU_USE_FASTER_LD)
|
||||
# clang should always use lld
|
||||
find_program(LLD lld)
|
||||
find_program(MOLD mold)
|
||||
|
||||
if (MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
|
||||
message(NOTICE "Selecting mold as linker")
|
||||
add_link_options("-fuse-ld=mold")
|
||||
elseif (LLD)
|
||||
message(NOTICE "Selecting lld as linker")
|
||||
add_link_options("-fuse-ld=lld")
|
||||
if (LLD)
|
||||
set(LINKER lld)
|
||||
endif()
|
||||
|
||||
# GNU appears to work better with mold
|
||||
# TODO: mold has been slow lately, see if better options exist (search for gold?)
|
||||
if (CXX_GCC)
|
||||
find_program(MOLD mold)
|
||||
if (MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
|
||||
set(LINKER mold)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
message(NOTICE "Selecting ${LINKER} as linker")
|
||||
add_link_options("-fuse-ld=${LINKER}")
|
||||
endif()
|
||||
|
||||
# Set runtime library to MD/MDd for all configurations
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_search_module(sirit QUIET IMPORTED_TARGET sirit)
|
||||
find_package_handle_standard_args(sirit
|
||||
REQUIRED_VARS sirit_LINK_LIBRARIES
|
||||
VERSION_VAR sirit_VERSION
|
||||
)
|
BIN
dist/icons/controller/applet_dual_joycon.png
vendored
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.7 KiB |
BIN
dist/icons/controller/applet_dual_joycon_dark.png
vendored
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
dist/icons/controller/applet_handheld.png
vendored
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
dist/icons/controller/applet_handheld_dark.png
vendored
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
dist/icons/controller/applet_handheld_disabled.png
vendored
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/controller/applet_handheld_midnight.png
vendored
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
dist/icons/controller/applet_pro_controller.png
vendored
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 3.2 KiB |
BIN
dist/icons/controller/applet_pro_controller_dark.png
vendored
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 3.3 KiB |
BIN
dist/icons/controller/applet_single_joycon_left.png
vendored
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/controller/applet_single_joycon_right.png
vendored
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
dist/icons/overlay/arrow_left.png
vendored
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 687 B |
BIN
dist/icons/overlay/arrow_left_dark.png
vendored
Before Width: | Height: | Size: 712 B After Width: | Height: | Size: 687 B |
BIN
dist/icons/overlay/arrow_right.png
vendored
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 656 B |
BIN
dist/icons/overlay/arrow_right_dark.png
vendored
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 656 B |
BIN
dist/icons/overlay/button_A_dark.png
vendored
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 2.3 KiB |
BIN
dist/icons/overlay/button_B_dark.png
vendored
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.1 KiB |
BIN
dist/icons/overlay/button_L.png
vendored
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 564 B |
BIN
dist/icons/overlay/button_L_dark.png
vendored
Before Width: | Height: | Size: 745 B After Width: | Height: | Size: 563 B |
BIN
dist/icons/overlay/button_R.png
vendored
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
dist/icons/overlay/button_R_dark.png
vendored
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
dist/icons/overlay/button_X_dark.png
vendored
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
dist/icons/overlay/button_Y_dark.png
vendored
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2 KiB |
BIN
dist/icons/overlay/button_minus.png
vendored
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
dist/icons/overlay/button_minus_dark.png
vendored
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
dist/icons/overlay/button_plus.png
vendored
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
dist/icons/overlay/button_plus_dark.png
vendored
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
dist/icons/overlay/button_press_stick_dark.png
vendored
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
dist/icons/overlay/osk_button_B.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_B_dark.png
vendored
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_B_dark_disabled.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_B_disabled.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_Y.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_Y_dark.png
vendored
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_Y_dark_disabled.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_Y_disabled.png
vendored
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
dist/icons/overlay/osk_button_plus.png
vendored
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
dist/icons/overlay/osk_button_plus_dark.png
vendored
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
dist/icons/overlay/osk_button_plus_dark_disabled.png
vendored
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
dist/icons/overlay/osk_button_plus_disabled.png
vendored
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
dist/icons/overlay/osk_button_shift_lock_off.png
vendored
Before Width: | Height: | Size: 936 B After Width: | Height: | Size: 648 B |
BIN
dist/icons/overlay/osk_button_shift_lock_on.png
vendored
Before Width: | Height: | Size: 894 B After Width: | Height: | Size: 648 B |
BIN
dist/icons/overlay/osk_button_shift_on_dark.png
vendored
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
dist/qt_themes/colorful/icons/16x16/checked.png
vendored
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 331 B |
BIN
dist/qt_themes/colorful/icons/16x16/info.png
vendored
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 365 B |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
dist/qt_themes/colorful/icons/48x48/chip.png
vendored
Before Width: | Height: | Size: 582 B After Width: | Height: | Size: 432 B |
BIN
dist/qt_themes/colorful/icons/48x48/folder.png
vendored
Before Width: | Height: | Size: 460 B After Width: | Height: | Size: 374 B |
BIN
dist/qt_themes/colorful/icons/48x48/list-add.png
vendored
Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 169 B |
BIN
dist/qt_themes/colorful/icons/48x48/sd_card.png
vendored
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 179 B |
BIN
dist/qt_themes/colorful/icons/48x48/star.png
vendored
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 854 B |
BIN
dist/qt_themes/default/icons/256x256/eden.png
vendored
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 4.9 KiB |
BIN
dist/qt_themes/default/icons/256x256/eden_named.png
vendored
Before Width: | Height: | Size: 3.7 MiB After Width: | Height: | Size: 2.7 MiB |
BIN
dist/qt_themes/default/icons/48x48/bad_folder.png
vendored
Before Width: | Height: | Size: 1,007 B After Width: | Height: | Size: 998 B |
BIN
dist/qt_themes/default/icons/48x48/list-add.png
vendored
Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 169 B |
BIN
dist/qt_themes/default/icons/48x48/sd_card.png
vendored
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 174 B |
BIN
dist/qt_themes/qdarkstyle/icons/16x16/lock.png
vendored
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 335 B |
BIN
dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png
vendored
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 998 B |
BIN
dist/qt_themes/qdarkstyle/icons/48x48/chip.png
vendored
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 532 B |
BIN
dist/qt_themes/qdarkstyle/icons/48x48/list-add.png
vendored
Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 169 B |
BIN
dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png
vendored
Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 174 B |
BIN
dist/qt_themes/qdarkstyle/rc/Hmovetoolbar.png
vendored
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 205 B |
BIN
dist/qt_themes/qdarkstyle/rc/Vmovetoolbar.png
vendored
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 492 B After Width: | Height: | Size: 401 B |
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 401 B |
Before Width: | Height: | Size: 252 B After Width: | Height: | Size: 204 B |
BIN
dist/qt_themes/qdarkstyle/rc/checkbox_unchecked.png
vendored
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 240 B After Width: | Height: | Size: 199 B |
BIN
dist/qt_themes/qdarkstyle/rc/close-hover.png
vendored
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 422 B |
BIN
dist/qt_themes/qdarkstyle/rc/close-pressed.png
vendored
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 422 B |
BIN
dist/qt_themes/qdarkstyle/rc/close.png
vendored
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 422 B |
BIN
dist/qt_themes/qdarkstyle/rc/radio_checked.png
vendored
Before Width: | Height: | Size: 940 B After Width: | Height: | Size: 734 B |
Before Width: | Height: | Size: 972 B After Width: | Height: | Size: 734 B |