From 14a23bec116edc3be27e511b88d5d028b642626d Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 25 Mar 2026 00:54:31 +0000 Subject: [PATCH] properly use bridging header, fix headers --- src/ios/AppUI-Bridging-Header.h | 7 ++----- src/ios/AppUI.swift | 8 +++----- src/ios/AppUIGameInformation.h | 7 ++----- src/ios/AppUIGameInformation.mm | 7 ++----- src/ios/AppUIObjC.h | 7 ++----- src/ios/AppUIObjC.mm | 7 ++----- src/ios/CMakeLists.txt | 9 ++++++--- src/ios/EmulationSession.h | 7 ++----- src/ios/EmulationSession.mm | 7 ++----- src/ios/EmulationWindow.h | 7 ++----- src/ios/EmulationWindow.mm | 7 ++----- 11 files changed, 27 insertions(+), 53 deletions(-) diff --git a/src/ios/AppUI-Bridging-Header.h b/src/ios/AppUI-Bridging-Header.h index d3bc77082f..00fadaa6dc 100644 --- a/src/ios/AppUI-Bridging-Header.h +++ b/src/ios/AppUI-Bridging-Header.h @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// AppUI-Bridging-Header.h - Sudachi -// Created by Jarrod Norwell on 4/3/2024. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef AppUI_Bridging_Header_h #define AppUI_Bridging_Header_h diff --git a/src/ios/AppUI.swift b/src/ios/AppUI.swift index 0dd7ac4dd8..b1d95324cc 100644 --- a/src/ios/AppUI.swift +++ b/src/ios/AppUI.swift @@ -1,11 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later -// -// AppUI.swift - Sudachi -// Created by Jarrod Norwell on 4/3/2024. -// - +import UIKit import Foundation import QuartzCore.CAMetalLayer diff --git a/src/ios/AppUIGameInformation.h b/src/ios/AppUIGameInformation.h index ef8537faee..1a602956c3 100644 --- a/src/ios/AppUIGameInformation.h +++ b/src/ios/AppUIGameInformation.h @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// AppUIGameInformation.h - Sudachi -// Created by Jarrod Norwell on 1/20/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import diff --git a/src/ios/AppUIGameInformation.mm b/src/ios/AppUIGameInformation.mm index 4b69324420..713494dfac 100644 --- a/src/ios/AppUIGameInformation.mm +++ b/src/ios/AppUIGameInformation.mm @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// AppUIGameInformation.mm - Sudachi -// Created by Jarrod Norwell on 1/20/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import #import "AppUIGameInformation.h" diff --git a/src/ios/AppUIObjC.h b/src/ios/AppUIObjC.h index ec5a5f1e8c..921f333199 100644 --- a/src/ios/AppUIObjC.h +++ b/src/ios/AppUIObjC.h @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// AppUIObjC.h - Sudachi -// Created by Jarrod Norwell on 1/8/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import #import diff --git a/src/ios/AppUIObjC.mm b/src/ios/AppUIObjC.mm index c03a20c530..5cd7f72b21 100644 --- a/src/ios/AppUIObjC.mm +++ b/src/ios/AppUIObjC.mm @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// AppUIObjC.mm - Sudachi -// Created by Jarrod Norwell on 1/8/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import "AppUIObjC.h" diff --git a/src/ios/CMakeLists.txt b/src/ios/CMakeLists.txt index ede2211f46..9c16277609 100644 --- a/src/ios/CMakeLists.txt +++ b/src/ios/CMakeLists.txt @@ -18,9 +18,12 @@ add_executable(eden-ios EmulationWindow.mm ) -# Keep identifier as-is, for compatibility sake -set_property(TARGET eden-ios PROPERTY XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.yuzu-emu.yuzu") -set_property(TARGET eden-ios PROPERTY XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "YUZU1234") +# Keep bundle identifier as-is, for compatibility sake +set_target_properties(eden-ios PROPERTIES + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.yuzu-emu.yuzu" + XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "YUZU1234" + SWIFT_OBJC_BRIDGING_HEADER "AppUI-Bridging-Header.h" +) target_link_libraries(eden-ios PRIVATE common core input_common frontend_common video_core glad) target_link_libraries(eden-ios PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) diff --git a/src/ios/EmulationSession.h b/src/ios/EmulationSession.h index 287a65839d..c6bce5e4dd 100644 --- a/src/ios/EmulationSession.h +++ b/src/ios/EmulationSession.h @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// EmulationSession.h - Sudachi -// Created by Jarrod Norwell on 1/20/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/ios/EmulationSession.mm b/src/ios/EmulationSession.mm index 9b4171e082..16f0709d8a 100644 --- a/src/ios/EmulationSession.mm +++ b/src/ios/EmulationSession.mm @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// EmulationSession.m - Sudachi -// Created by Jarrod Norwell on 1/20/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import "EmulationSession.h" diff --git a/src/ios/EmulationWindow.h b/src/ios/EmulationWindow.h index 53162a7f58..8d285ab33e 100644 --- a/src/ios/EmulationWindow.h +++ b/src/ios/EmulationWindow.h @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// EmulationWindow.h - Sudachi -// Created by Jarrod Norwell on 1/18/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/ios/EmulationWindow.mm b/src/ios/EmulationWindow.mm index 638db800a8..4ed6f84c81 100644 --- a/src/ios/EmulationWindow.mm +++ b/src/ios/EmulationWindow.mm @@ -1,10 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later - -// -// EmulationWindow.mm - Sudachi -// Created by Jarrod Norwell on 1/18/24. -// +// SPDX-FileCopyrightText: Copyright 2024 Jarrod Norwell +// SPDX-License-Identifier: GPL-2.0-or-later #import "EmulationWindow.h" #import "EmulationSession.h"