From 0ef5983cec97412db8ca2d3a64ceca3c838a3206 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 1 Jun 2026 20:09:09 +0000 Subject: [PATCH] fix? --- src/common/error.cpp | 3 ++ src/common/string_util.cpp | 2 +- src/common/swap.h | 2 +- src/frontend_common/data_manager.h | 2 +- src/frontend_common/firmware_manager.h | 2 +- .../renderer_vulkan/vk_turbo_mode.cpp | 2 +- .../renderer_vulkan/vk_turbo_mode.h | 3 ++ src/video_core/smaa_area_tex.h | 3 ++ src/video_core/smaa_search_tex.h | 3 ++ tools/cpp-lint.sh | 37 ++++++++++++++----- 10 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/common/error.cpp b/src/common/error.cpp index 59d9aa4c7e..070c9a5c7e 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project // SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 2ad50c903b..9543a62343 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2013 Dolphin Emulator Project diff --git a/src/common/swap.h b/src/common/swap.h index 1184ac5785..c7646ea24d 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2012 PPSSPP Project diff --git a/src/frontend_common/data_manager.h b/src/frontend_common/data_manager.h index 317437f6c6..b43067d984 100644 --- a/src/frontend_common/data_manager.h +++ b/src/frontend_common/data_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/frontend_common/firmware_manager.h b/src/frontend_common/firmware_manager.h index a9119d9e39..4c1297431d 100644 --- a/src/frontend_common/firmware_manager.h +++ b/src/frontend_common/firmware_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp index a65e60de25..095908b6cf 100644 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.h b/src/video_core/renderer_vulkan/vk_turbo_mode.h index 44c37439c9..6f95cf5e74 100644 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.h +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/video_core/smaa_area_tex.h b/src/video_core/smaa_area_tex.h index 486ff3e3e0..aa4000d315 100644 --- a/src/video_core/smaa_area_tex.h +++ b/src/video_core/smaa_area_tex.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2013 Jorge Jimenez (jorge@iryoku.com) // SPDX-FileCopyrightText: 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com) // SPDX-FileCopyrightText: 2013 Belen Masia (bmasia@unizar.es) diff --git a/src/video_core/smaa_search_tex.h b/src/video_core/smaa_search_tex.h index 3e24d4df6e..3a74ab0a32 100644 --- a/src/video_core/smaa_search_tex.h +++ b/src/video_core/smaa_search_tex.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2013 Jorge Jimenez (jorge@iryoku.com) // SPDX-FileCopyrightText: 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com) // SPDX-FileCopyrightText: 2013 Belen Masia (bmasia@unizar.es) diff --git a/tools/cpp-lint.sh b/tools/cpp-lint.sh index 1318c0d6f3..ff1306c137 100755 --- a/tools/cpp-lint.sh +++ b/tools/cpp-lint.sh @@ -21,12 +21,8 @@ Dumb script that serves as a ad-hoc cpp-linter Commands: once Check for #pragma once prescence in header files - osdef Fixes OS defines that are not recommended to use: - ANDROID - _WIN64 - linux - __unix__ - __unix + osdef Finds OS defines that are not recommended to use. + inchk Check includes being valid/toolchain not being stupid EOF } @@ -37,10 +33,31 @@ while :; do break ;; osdef) - find "$SRC_DIR" -type f -name "*.h" \ - -exec grep -nw "ANDROID\|_WIN64\|__linux\|__unix\|APPLE\|__APPLE" {} + || echo - find "$SRC_DIR" -type f -name "*.h" -exec grep -nw "ifdef linux\|(linux)" {} + || echo - find "$SRC_DIR" -type f -name "*.h" -exec grep -nw "ifdef unix\|(unix)" {} + || echo + # not recommended macros + PATTERN="ANDROID\|_WIN64\|__linux\|__unix\|APPLE\|__APPLE" + PATTERN="$PATTERN\|ifdef ANDROID\|(ANDROID)" + PATTERN="$PATTERN\|ifdef _WIN64\|(_WIN64)" + PATTERN="$PATTERN\|ifdef __linux\|(__linux)" + PATTERN="$PATTERN\|ifdef __unix\|(__unix)" + PATTERN="$PATTERN\|ifdef APPLE\|(APPLE)" + PATTERN="$PATTERN\|ifdef __APPLE\|(__APPLE)" + PATTERN="$PATTERN\|ifdef linux\|(linux)" + PATTERN="$PATTERN\|ifdef unix\|(unix)" + # if statements for macros that shouldn't be if + PATTERN="$PATTERN\|if _WIN32" + PATTERN="$PATTERN\|if _AIX" + PATTERN="$PATTERN\|if __managarm__" + PATTERN="$PATTERN\|if __unix__" + PATTERN="$PATTERN\|if __linux__" + PATTERN="$PATTERN\|if __FreeBSD__" + PATTERN="$PATTERN\|if __NetBSD__" + PATTERN="$PATTERN\|if __OpenBSD__" + PATTERN="$PATTERN\|if __DragonFly__" + PATTERN="$PATTERN\|if __redox__" + PATTERN="$PATTERN\|if __HAIKU__" + PATTERN="$PATTERN\|if __OHOS__" + PATTERN="$PATTERN\|if __FIREOS__" + find "$SRC_DIR" -type f -name "*.h" -exec grep -nw "$PATTERN" {} + || echo break ;; *) usage ;;