no x11 find
This commit is contained in:
parent
19852c453f
commit
d06beb71a1
|
|
@ -448,16 +448,3 @@ if (APPLE)
|
|||
set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# We are NOT adding this to cpmfile.json
|
||||
# In BSD world, it is often the case that X11
|
||||
# will be under /usr/X11R{5,6,7}/include/...
|
||||
# ...
|
||||
# FreeBSD was able to see with hindsight this was a bad idea.
|
||||
# OpenBSD, OmniOS and NetBSD by default, aren't illuminated yet by this notion.
|
||||
#
|
||||
# Reliance on X11 Headers being available without explicitly
|
||||
# linking or mentioning X11 is something to note.
|
||||
if (NOT (WIN32 OR APPLE OR ANDROID OR HAIKU OR PS4))
|
||||
find_package(X11 REQUIRED)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -62,12 +62,6 @@ if (USE_DISCORD_PRESENCE)
|
|||
target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)
|
||||
endif()
|
||||
|
||||
# Qt itself may use Vulkan stuffs so we'd need to account for that as well
|
||||
if (X11_FOUND)
|
||||
target_include_directories(qt_common PUBLIC ${X11_INCLUDE_DIR})
|
||||
target_link_libraries(qt_common PUBLIC ${X11_LIBRARIES})
|
||||
endif()
|
||||
|
||||
# TODO(crueter)
|
||||
target_link_libraries(qt_common PRIVATE Qt6::Widgets)
|
||||
|
||||
|
|
|
|||
|
|
@ -405,11 +405,6 @@ if (ENABLE_OPENGL)
|
|||
)
|
||||
endif()
|
||||
|
||||
if (X11_FOUND)
|
||||
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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue