ok x11 fine

aarch64-linux-gnu.cmake

@@ -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

@@ -411,11 +411,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()

src/video_core/CMakeLists.txt

@@ -326,6 +326,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)
@@ -346,16 +359,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)