RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 04:02:42 +01:00
Code Issues Releases Wiki Activity

cmake: fix EGL and add USE_SYSTEM_CURL

Browse Source
This commit is contained in:
oltolm 2024-08-15 20:23:16 +02:00 committed by Elad
parent 042a5481ca
commit 7f30e52fda
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/CMakeLists.txt vendored
View File

@ -108,7 +108,7 @@ endif()
# OpenGL # OpenGL
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS EGL)
add_library(3rdparty_opengl INTERFACE) add_library(3rdparty_opengl INTERFACE)
target_include_directories(3rdparty_opengl INTERFACE GL) target_include_directories(3rdparty_opengl INTERFACE GL)

1
CMakeLists.txt
View File

@ -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_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_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_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") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake")

1
rpcs3/CMakeLists.txt
View File

@ -30,7 +30,6 @@ if(UNIX AND NOT APPLE)
find_package(Wayland) find_package(Wayland)
if(WAYLAND_FOUND) if(WAYLAND_FOUND)
add_definitions(-DHAVE_WAYLAND) add_definitions(-DHAVE_WAYLAND)
set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "EGL")
endif() endif()
endif() endif()

4
rpcs3/Emu/CMakeLists.txt
View File

@ -626,3 +626,7 @@ endif()
if(USE_PRECOMPILED_HEADERS) if(USE_PRECOMPILED_HEADERS)
target_precompile_headers(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/rpcs3/stdafx.h") target_precompile_headers(rpcs3_emu PRIVATE "${PROJECT_SOURCE_DIR}/rpcs3/stdafx.h")
endif() endif()
if(WAYLAND_FOUND)
target_link_libraries(rpcs3_emu PRIVATE OpenGL::EGL)
endif()