mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/web_wallpaper' into web_wallpaper

Browse Source
This commit is contained in:
Pasalc 2024-01-06 22:28:55 +03:00
commit dd7da615a2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ build/
.vscode/ .vscode/
debug/ debug/
temp/ temp/
third_party/
*-protocol.o *-protocol.o
*-protocol.c *-protocol.c

13
CMakeLists.txt
View File

@ -34,7 +34,7 @@ find_package(PulseAudio REQUIRED)
# Download CEF of specified version for current platform # Download CEF of specified version for current platform
# Specify the CEF distribution version. # Specify the CEF distribution version.
set(CEF_VERSION "106.0.26+ge105400+chromium-106.0.5249.91") set(CEF_VERSION "120.1.10+g3ce3184+chromium-120.0.6099.129")
# Determine the platform. # Determine the platform.
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
if("${PROJECT_ARCH}" STREQUAL "arm64") if("${PROJECT_ARCH}" STREQUAL "arm64")
@ -113,9 +113,6 @@ ADD_LOGICAL_TARGET("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
# SET_CEF_TARGET_OUT_DIR() # SET_CEF_TARGET_OUT_DIR()
include_directories(${_CEF_ROOT}) include_directories(${_CEF_ROOT})
target_include_directories(ceflib
INTERFACE "/home/kermit/Projects/fun/linux-wallpaperengine/cef-project/third_party/cef/cef_binary_106.0.26+ge105400+chromium-106.0.5249.91_linux64/include")
# try to enable wayland builds when possible # try to enable wayland builds when possible
pkg_check_modules(WAYLAND_SUPPORT wayland-cursor wayland-protocols egl wayland-egl) pkg_check_modules(WAYLAND_SUPPORT wayland-cursor wayland-protocols egl wayland-egl)
@ -405,8 +402,11 @@ COPY_FILES(linux-wallpaperengine "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "
SET_EXECUTABLE_TARGET_PROPERTIES(linux-wallpaperengine) SET_EXECUTABLE_TARGET_PROPERTIES(linux-wallpaperengine)
add_dependencies(linux-wallpaperengine libcef_dll_wrapper) add_dependencies(linux-wallpaperengine libcef_dll_wrapper)
# Need to remove libvulkan, otherwise will get error on linking:
# /usr/bin/ld: /usr/lib/libmpv.so: undefined reference to `vkCreateXlibSurfaceKHR'
file(REMOVE "${CEF_BINARY_DIR_DEBUG}/libvulkan.so.1" "${CEF_BINARY_DIR_RELEASE}/libvulkan.so.1")
target_link_libraries (linux-wallpaperengine PUBLIC target_link_libraries (linux-wallpaperengine PUBLIC
libcef_lib libcef_dll_wrapper
${X11_LIBRARIES} ${X11_LIBRARIES}
${Xrandr_LIBRARIES} ${Xrandr_LIBRARIES}
${X11_Xxf86vm_LIB} ${X11_Xxf86vm_LIB}
@ -420,7 +420,8 @@ target_link_libraries (linux-wallpaperengine PUBLIC
${FREEIMAGE_LIBRARIES} ${FREEIMAGE_LIBRARIES}
${MPV_LIBRARY} ${MPV_LIBRARY}
${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_LIBRARY}
glfw) glfw
libcef_lib libcef_dll_wrapper)
if (WAYLAND_SUPPORT_FOUND) if (WAYLAND_SUPPORT_FOUND)

2
CMakeModules/cef_variables.cmake
View File

@ -219,7 +219,7 @@ if(OS_LINUX)
libEGL.so libEGL.so
libGLESv2.so libGLESv2.so
libvk_swiftshader.so libvk_swiftshader.so
libvulkan.so.1 # libvulkan.so.1
snapshot_blob.bin snapshot_blob.bin
v8_context_snapshot.bin v8_context_snapshot.bin
vk_swiftshader_icd.json vk_swiftshader_icd.json