From 2101914c9d483772281a0ca930f9c2ec19c438be Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 4 Jun 2021 21:26:45 -0700 Subject: [PATCH] Adds drm headers to an external repository It's highly likely that the host system won't have these headers installed. Carry them in an external repository to ensure they are available. Fixes #1047 --- .gitmodules | 3 +++ External/drm-headers | 1 + Source/Tests/LinuxSyscalls/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+) create mode 160000 External/drm-headers diff --git a/.gitmodules b/.gitmodules index 553083ac5..a49f799a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,3 +36,6 @@ [submodule "External/fmt"] path = External/fmt url = https://github.com/fmtlib/fmt.git +[submodule "External/drm-headers"] + path = External/drm-headers + url = https://github.com/FEX-Emu/drm-headers.git diff --git a/External/drm-headers b/External/drm-headers new file mode 160000 index 000000000..2b23749e3 --- /dev/null +++ b/External/drm-headers @@ -0,0 +1 @@ +Subproject commit 2b23749e35cfbde8de875e803fd7c903a48a71e3 diff --git a/Source/Tests/LinuxSyscalls/CMakeLists.txt b/Source/Tests/LinuxSyscalls/CMakeLists.txt index 77e4a8896..32279a384 100644 --- a/Source/Tests/LinuxSyscalls/CMakeLists.txt +++ b/Source/Tests/LinuxSyscalls/CMakeLists.txt @@ -59,6 +59,7 @@ add_library(LinuxEmulation STATIC target_link_libraries(LinuxEmulation FEXCore pthread numa) target_include_directories(LinuxEmulation PRIVATE ${CMAKE_BINARY_DIR}/generated) +target_include_directories(LinuxEmulation PRIVATE ${PROJECT_SOURCE_DIR}/External/drm-headers/include/) set(HEADERS_TO_VERIFY x32/Types.h x86_32 # This needs to match structs to 32bit structs