Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-02 08:28:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix most build errors

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2026-03-26 02:53:43 -04:00 • committed by lizzie
parent 7e46986a20
commit 858c49a648
12 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/CMakeLists.txt
View file

@ -1273,9 +1273,6 @@ endif()
target_sources(core PRIVATE hle/service/ssl/ssl_backend_openssl.cpp)
target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
if (NOT IOS)
target_compile_definitions(core PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
endif()
# TODO

3
src/frontend_common/CMakeLists.txt
View file

@ -23,9 +23,6 @@ if (ENABLE_UPDATE_CHECKER)
update_checker.cpp
update_checker.h)
target_link_libraries(frontend_common PRIVATE OpenSSL::SSL OpenSSL::Crypto)
if (NOT IOS)
target_compile_definitions(frontend_common PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
endif()
endif()
create_target_directory_groups(frontend_common)

3
src/ios/CMakeLists.txt
View file

@ -15,6 +15,7 @@ add_executable(eden-ios
EmulationSession.mm
EmulationWindow.h
EmulationWindow.mm
VMA.cpp
)
# Keep bundle identifier as-is, for compatibility sake
set_target_properties(eden-ios PROPERTIES
@ -26,5 +27,5 @@ set_target_properties(eden-ios PROPERTIES
)
target_link_libraries(eden-ios PRIVATE common core input_common frontend_common video_core sirit::sirit)
target_link_libraries(eden-ios PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
target_link_libraries(eden-ios PRIVATE SDL2::SDL2 glad)
target_link_libraries(eden-ios PRIVATE SDL2::SDL2 glad stb::headers)
create_target_directory_groups(eden-ios)

5
src/ios/VMA.cpp Normal file
View file

@ -0,0 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#define VMA_IMPLEMENTATION
#include "video_core/vulkan_common/vma.h"

3
src/qt_common/CMakeLists.txt
View file

@ -50,9 +50,6 @@ if (USE_DISCORD_PRESENCE)
if (YUZU_USE_BUNDLED_OPENSSL)
target_link_libraries(qt_common PUBLIC OpenSSL::SSL OpenSSL::Crypto)
if (NOT IOS)
target_compile_definitions(qt_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
endif()
endif()
target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)

7
src/video_core/vulkan_common/vma.h
View file

@ -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 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@ -13,9 +13,14 @@
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable : 4189 )
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#endif
#include "vk_mem_alloc.h"
#ifdef _MSC_VER
#pragma warning( pop )
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif