Browse Source

no x11 find

lizzie/netbsdgcc14-fix
lizzie 2 days ago
parent
commit
5ed3a6f100
  1. 13
      externals/CMakeLists.txt
  2. 6
      src/qt_common/CMakeLists.txt
  3. 5
      src/video_core/CMakeLists.txt

13
externals/CMakeLists.txt

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

6
src/qt_common/CMakeLists.txt

@ -62,12 +62,6 @@ if (USE_DISCORD_PRESENCE)
target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE) target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)
endif() 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) # TODO(crueter)
target_link_libraries(qt_common PRIVATE Qt6::Widgets) target_link_libraries(qt_common PRIVATE Qt6::Widgets)

5
src/video_core/CMakeLists.txt

@ -358,11 +358,6 @@ if (ENABLE_OPENGL)
) )
endif() 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 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)

Loading…
Cancel
Save