mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-12-24 15:15:11 +00:00
cmake: fix EGL and add USE_SYSTEM_CURL
This commit is contained in:
parent
042a5481ca
commit
7f30e52fda
2
3rdparty/CMakeLists.txt
vendored
2
3rdparty/CMakeLists.txt
vendored
@ -108,7 +108,7 @@ endif()
|
||||
|
||||
# OpenGL
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
|
||||
|
||||
add_library(3rdparty_opengl INTERFACE)
|
||||
target_include_directories(3rdparty_opengl INTERFACE GL)
|
||||
|
@ -28,6 +28,7 @@ option(USE_SDL "Enables SDL input handler" OFF)
|
||||
option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" OFF)
|
||||
option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF)
|
||||
option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON)
|
||||
option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")
|
||||
|
||||
|
@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE)
|
||||
find_package(Wayland)
|
||||
if(WAYLAND_FOUND)
|
||||
add_definitions(-DHAVE_WAYLAND)
|
||||
set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "EGL")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -626,3 +626,7 @@ endif()
|
||||
if(USE_PRECOMPILED_HEADERS)
|
||||
target_precompile_headers(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/rpcs3/stdafx.h")
|
||||
endif()
|
||||
|
||||
if(WAYLAND_FOUND)
|
||||
target_link_libraries(rpcs3_emu PRIVATE OpenGL::EGL)
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user