debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-31 10:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ok x11 fine

Browse Source
This commit is contained in:
lizzie
2026-06-13 02:21:18 -04:00
parent 429f380a93
commit 0ef08a0a8c
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aarch64-linux-gnu.cmake
+16
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)
externals/CMakeLists.txt
Vendored
-8
View File
@@ -411,11 +411,3 @@ if (APPLE)
set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE) set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE)
endif() endif()
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()
src/video_core/CMakeLists.txt
+13 -10
View File
@@ -358,6 +358,19 @@ if (ENABLE_OPENGL)
) )
endif() 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 common core)
target_link_libraries(video_core PUBLIC shader_recompiler stb bc_decoder gpu_logging) target_link_libraries(video_core PUBLIC shader_recompiler stb bc_decoder gpu_logging)
if (ENABLE_OPENGL) if (ENABLE_OPENGL)
@@ -378,16 +391,6 @@ target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
target_link_libraries(video_core PRIVATE sirit::sirit) 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 # Header-only stuff needed by all dependent targets
target_link_libraries(video_core PUBLIC Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator) target_link_libraries(video_core PUBLIC Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)