Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-15 06:52:34 +02:00
Code Issues Projects Releases Activity

Fix linux compilation

Browse Source
This commit is contained in:
Elias Steurer 2020-03-07 21:37:01 +01:00 committed by Dominik Louven
parent 0032332139
commit d066ac22ff
8 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ScreenPlay/ScreenPlay.pro
View File

@ -5,7 +5,7 @@ CONFIG += c++17
TARGETPATH = ScreenPlay
include($$PWD/../Common/qt-google-analytics/qt-google-analytics.pri)
include($$PWD/../Common/qt-breakpad/qt-breakpad.pri)
ICON = favicon.ico
@ -69,7 +69,6 @@ HEADERS += \
INCLUDEPATH += \
$$PWD/src/\
CONFIG(debug, debug|release) {
install_assets.path = $${OUT_PWD}/assets/fonts
} else {
@ -135,22 +134,25 @@ unix {
INCLUDEPATH += $$PWD/../Common/vcpkg/installed/x64-linux/include
DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-linux/include
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-linux/lib/ -llibzippp -lzip
install_it.path = $${OUT_PWD}
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-linux/debug/lib/ -lzip -llibzippp
install_it.files += $$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/zip.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/zlibd1.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/libzippp.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/liblibzippp.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/bz2d.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/libcrypto-1_1-x64.so \
$$PWD/../Common/vcpkg/installed/x64-linux/debug/bin/libssl-1_1-x64.so \
} else {
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-linux/lib/ -lzip -llibzippp
install_it.files += $$PWD/../Common/vcpkg/installed/x64-linux/bin/zip.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/zlib1.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/libzippp.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/liblibzippp.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/bz2.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/libcrypto-1_1-x64.so \
$$PWD/../Common/vcpkg/installed/x64-linux/bin/libssl-1_1-x64.so \

2
ScreenPlay/app.cpp
View File

@ -52,7 +52,9 @@ App::App()
QGuiApplication::setApplicationVersion("0.10.0");
QGuiApplication::setQuitOnLastWindowClosed(false);
#ifdef Q_OS_WINDOWS
QtBreakpad::init(QDir::current().absolutePath());
#endif
QFontDatabase::addApplicationFont(":/assets/fonts/LibreBaskerville-Italic.ttf");

3
ScreenPlay/app.h
View File

@ -16,8 +16,9 @@
#include <memory>
#include "ganalytics.h"
#ifdef Q_OS_WINDOWS
#include "qt_breakpad.h"
#endif
#include "src/create.h"
#include "src/globalvariables.h"
#include "src/installedlistfilter.h"

3
ScreenPlay/src/settings.h
View File

@ -203,8 +203,9 @@ public slots:
settings.sync();
} else {
settings.remove("ScreenPlay");
#endif
}
#endif
setqSetting("Autostart", autostart);

2
ScreenPlayWallpaper/ScreenPlayWallpaper.pro
View File

@ -6,7 +6,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
TARGETPATH = ScreenPlayWallpaper
include($$PWD/../Common/qt-breakpad/qt-breakpad.pri)
RESOURCES += \
@ -29,6 +28,7 @@ unix{
}
win32 {
include($$PWD/../Common/qt-breakpad/qt-breakpad.pri)
LIBS += -luser32
SOURCES += \
src/windowsdesktopproperties.cpp \

11
ScreenPlayWallpaper/main.cpp
View File

@ -6,6 +6,8 @@
#include <QtWebEngine>
#if defined(Q_OS_WIN)
#include "qt_breakpad.h"
#include "src/winwindow.h"
#endif
@ -18,7 +20,6 @@
#endif
#include "../ScreenPlaySDK/screenplaysdk.h"
#include "qt_breakpad.h"
int main(int argc, char* argv[])
{
@ -28,8 +29,6 @@ int main(int argc, char* argv[])
QApplication app(argc, argv);
QtBreakpad::init(QDir::current().absolutePath());
// This gives us nice clickable output in QtCreator
qSetMessagePattern("%{if-category}%{category}: %{endif}%{message}\n Loc: [%{file}:%{line}]");
@ -41,6 +40,8 @@ int main(int argc, char* argv[])
//Set the monitor number to test
#if defined(Q_OS_WIN)
QtBreakpad::init(QDir::current().absolutePath());
//WinWindow window1({ 0 }, "test", "appid", "1", "fill");
//WinWindow window2({ 1 }, "test", "appid", "1", "fill");
//WinWindow window3({ 2 }, "test", "appid", "1", "fill");
@ -48,7 +49,7 @@ int main(int argc, char* argv[])
WinWindow window({ 0 }, "H:/SteamLibrary/SteamApps/workshop/content/672870/MechaGirl", "appid", "1", "fill", false);
#endif
#if defined(Q_OS_LINUX)
LinuxWindow window(QVector<int>{ 0 }, "test", "appid", "1", "fill");
LinuxWindow window(QVector<int>{ 0 }, "test", "appid", "1", "fill",false);
#endif
#if defined(Q_OS_OSX)
MacWindow window({ 0 }, "test", "appid", "1", "fill");
@ -115,7 +116,7 @@ int main(int argc, char* argv[])
#endif
#if defined(Q_OS_LINUX)
LinuxWindow window(list, argumentList.at(2), argumentList.at(3), argumentList.at(4), argumentList.at(5));
LinuxWindow window(list, argumentList.at(2), argumentList.at(3), argumentList.at(4), argumentList.at(5),false);
QObject::connect(&sdk, &ScreenPlaySDK::sdkDisconnected, &window, &LinuxWindow::destroyThis);
QObject::connect(&sdk, &ScreenPlaySDK::incommingMessage, &window, &LinuxWindow::messageReceived);
#endif

4
ScreenPlayWallpaper/src/linuxwindow.cpp
View File

@ -1,7 +1,7 @@
#include "linuxwindow.h"
LinuxWindow::LinuxWindow(QVector<int> activeScreensList, QString projectPath, QString id, QString volume, const QString fillmode, QObject* parent)
: BaseWindow(projectPath)
LinuxWindow::LinuxWindow(QVector<int> activeScreensList, QString projectPath, QString id, QString volume, const QString fillmode,const bool checkWallpaperVisible, QObject* parent)
: BaseWindow(projectPath,activeScreensList,checkWallpaperVisible)
{
setAppID(id);
bool ok = false;

2
ScreenPlayWallpaper/src/linuxwindow.h
View File

@ -17,7 +17,7 @@ class LinuxWindow : public BaseWindow
{
Q_OBJECT
public:
explicit LinuxWindow(QVector<int> activeScreensList, QString projectPath, QString id, QString volume, const QString fillmode,QObject *parent = nullptr);
explicit LinuxWindow(QVector<int> activeScreensList, QString projectPath, QString id, QString volume, const QString fillmode,const bool checkWallpaperVisible, QObject *parent = nullptr);
signals: