Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-03 00:59:47 +02:00
Code Issues Projects Releases Activity

Fix linux compilation

Browse Source
This commit is contained in:
Elias Steurer 2023-11-09 12:10:52 +01:00
parent 55996b2914
commit b66e293b55
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ScreenPlay/CMakeLists.txt
View File

@ -295,7 +295,6 @@ target_link_libraries(
ScreenPlayApp ScreenPlayApp
PUBLIC ScreenPlaySDK PUBLIC ScreenPlaySDK
LibArchive::LibArchive LibArchive::LibArchive
ScreenPlayWallpaperLib
ScreenPlayUtil ScreenPlayUtil
ScreenPlayUtilplugin ScreenPlayUtilplugin
QArchive QArchive
@ -354,7 +353,7 @@ if(WIN32
endif() endif()
if(WIN32) if(WIN32)
target_link_libraries(ScreenPlayApp PUBLIC CURL::libcurl sentry::sentry) target_link_libraries(ScreenPlayApp PUBLIC CURL::libcurl sentry::sentry ScreenPlayWallpaperLib)
# Icon # Icon
target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc) target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc)

2
ScreenPlay/src/monitorlistmodel.cpp
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only // SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
#include "ScreenPlay/monitorlistmodel.h" #include "ScreenPlay/monitorlistmodel.h"
#ifdef Q_OS_WIN
#include "windowsintegration.h" #include "windowsintegration.h"
#endif
#include <QGuiApplication> #include <QGuiApplication>
namespace ScreenPlay { namespace ScreenPlay {

2
ScreenPlay/src/settings.cpp
View File

@ -177,7 +177,7 @@ void Settings::setupWidgetAndWindowPaths()
m_globalVariables->setGodotWallpaperExecutablePath(QUrl(workingDir.path() + basePath + "ScreenPlayWallpaperGodot").toLocalFile()); m_globalVariables->setGodotWallpaperExecutablePath(QUrl(workingDir.path() + basePath + "ScreenPlayWallpaperGodot").toLocalFile());
const auto godotEditorName = "Godot_" + godotVersion + "-stable_osx.universal"; const auto godotEditorName = "Godot_" + godotVersion + "-stable_osx.universal";
m_globalVariables->setGodotEditorExecutablePath(QUrl(workingDir.path() + "/" + godotEditorName)); m_globalVariables->setGodotEditorExecutablePath(QUrl(workingDir.path() + "/" + godotEditorName));
} else if (osType == "linux") { } else if (osType == "linux" || osType == "ubuntu") {
m_globalVariables->setWidgetExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWidget")); m_globalVariables->setWidgetExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWidget"));
m_globalVariables->setWallpaperExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWallpaper")); m_globalVariables->setWallpaperExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWallpaper"));
m_globalVariables->setGodotWallpaperExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWallpaperGodot")); m_globalVariables->setGodotWallpaperExecutablePath(QUrl(workingDir.path() + "/ScreenPlayWallpaperGodot"));

4
ScreenPlayWallpaper/CMakeLists.txt
View File

@ -63,9 +63,7 @@ endif()
add_executable( add_executable(
${PROJECT_NAME} ${PROJECT_NAME}
${SOURCES} ${SOURCES}
${HEADER} ${HEADER})
src/windowsintegration.h
src/windowsintegration.cpp)
qt_add_qml_module( qt_add_qml_module(
${PROJECT_NAME} ${PROJECT_NAME}