Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-06-28 11:55:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ok x11 fine

Browse source
This commit is contained in:
lizzie 2026-06-13 02:21:18 -04:00
parent 6e0ea7f898
commit 38708c35bb
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
aarch64-linux-gnu.cmake Normal file
View file

@ -0,0 +1,16 @@
# CMake Toolchain file for crosscompiling on ARM. Target operating system name.
set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR aarch64)
# Name of C compiler.
set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
# Where to look for the target environment. (More paths can be added here)
set(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu)
set(CMAKE_SYSROOT /usr/aarch64-linux-gnu)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

8
externals/CMakeLists.txt vendored
View file

@ -412,11 +412,3 @@ if (APPLE)
set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE)
endif()
endif()
# must match src/video_core/vulkan_common/vulkan.h logic
# No we can't "bundle" this... never... NEVER
if (WIN32 OR APPLE OR ANDROID OR PLATFORM_HAIKU OR PLATFORM_PS4)
# ...
else()
find_package(X11 REQUIRED)
endif()

23
src/video_core/CMakeLists.txt
View file

@ -324,6 +324,19 @@ if (ENABLE_OPENGL)
)
endif()
# Since this is also used by header-only whom is public:
# a) you must also make it public
# b) should precede the headers themselves
# c) since targets also export targets publicly, this should precede them as well
# must match src/video_core/vulkan_common/vulkan.h logic
if (WIN32 OR APPLE OR ANDROID OR PLATFORM_HAIKU OR PLATFORM_PS4)
# ...
else()
find_package(X11 REQUIRED)
target_include_directories(video_core PUBLIC ${X11_INCLUDE_DIR})
target_link_libraries(video_core PUBLIC ${X11_LIBRARIES})
endif()
target_link_libraries(video_core PUBLIC common core)
target_link_libraries(video_core PUBLIC shader_recompiler stb bc_decoder gpu_logging)
if (ENABLE_OPENGL)
@ -344,16 +357,6 @@ target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
target_link_libraries(video_core PRIVATE sirit::sirit)
# Since this is also used by header-only whom is public:
# a) you must also make it public
# b) should precede the headers themselves
# must match src/video_core/vulkan_common/vulkan.h logic
if (WIN32 OR APPLE OR ANDROID OR PLATFORM_HAIKU OR PLATFORM_PS4)
# ...
else()
target_link_libraries(video_core PUBLIC X11)
endif()
# Header-only stuff needed by all dependent targets
target_link_libraries(video_core PUBLIC Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)