mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-13 16:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix vulkan on X11

Browse Source
This commit is contained in:
kd-11 2019-12-20 15:29:04 +03:00 committed by kd-11
parent db4041e079
commit fff1007d9a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/CMakeLists.txt
View File

@ -18,6 +18,14 @@ elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv") set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv")
endif() endif()
if(UNIX AND NOT APPLE)
# Optionally enable X11 for window management
find_package(X11)
if(X11_FOUND)
add_definitions(-DHAVE_X11)
endif()
endif()
if(NOT RPCS3_SRC_DIR) if(NOT RPCS3_SRC_DIR)
set(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}) set(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
@ -80,17 +88,14 @@ if (WIN32)
target_sources(rpcs3 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.rc") target_sources(rpcs3 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.rc")
endif() endif()
if(UNIX AND NOT APPLE) # Unix display manager
find_package(X11)
if(X11_FOUND) if(X11_FOUND)
target_include_directories(rpcs3 PUBLIC ${X11_INCLUDE_DIR}) target_include_directories(rpcs3 PUBLIC ${X11_INCLUDE_DIR})
target_link_libraries(rpcs3 ${X11_LIBRARIES}) target_link_libraries(rpcs3 ${X11_LIBRARIES})
target_compile_definitions(rpcs3 INTERFACE -DHAVE_X11) elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE)
# This has been checked in 3rdparty/CMakeLists.txt already. # Wayland has been checked in 3rdparty/CMakeLists.txt already.
elseif(NOT WAYLAND_FOUND)
message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.") message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.")
endif() endif()
endif()
if(UNIX) if(UNIX)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)