diff --git a/README.md b/README.md
index 8972d635..a9bcf84b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,13 @@
+
+
+
+
# Requirements
-- [Download and install MSVC 2017 Community](https://visualstudio.microsoft.com/vs/community/)
-- [Download and install Win 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
+### Windows
+1. [Download and install MSVC 2017 Community](https://visualstudio.microsoft.com/vs/community/)
+2. [Download and install Win 10 SDK (debugging support. Not included via the MSVC installer)](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
- Select debugging support during the installation (CDB)
-- [Download and install Qt 5](https://www.qt.io/download-qt-installer)
+3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 5.11.2
@@ -10,17 +15,33 @@
- Qt WebEngine
- Tools
- Qt Creator 4.x CDB Debugger Support
+### Linux
+1. Install dependencies for your distro:
+``` bash
+# Debian/Ubuntu
+sudo apt install build-essential libgl1-mesa-dev
-# Optional
-This is only needed for a standalone Steam release build to run WinDeploy.sh!
-- [Download and install msys2 x86_x64](http://www.msys2.org/)
- - Start msys2
- - Run: ``` pacman -Syu ``` then restart terminal
- - Run: ``` pacman -Su ```
-
-# Release
-- Change in WinDeploy.sh the paths in Line 4 - 5 according to your setup
- - ReleasePath='C:\\Users\\Eli\\Code\\Qt\\build-ScreenPlay-Desktop-Release\\ScreenPlay\\release\\'
- - DeployPath='C:\\Users\\Eli\\Code\\Qt\\ScreenPlay-Deploy\\'
-- Run WinDeploy.sh
+# Fedora/RHEL/CentOS (yum)
+sudo yum groupinstall "C Development Tools and Libraries"
+sudo yum install mesa-libGL-devel
+# openSUSE (zypper)
+sudo zypper install -t pattern devel_basis
+```
+2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
+ - Install the Maintaince tool
+ - Select the following features to install:
+ - Qt 5.11.2
+ - GCC
+ - Qt WebEngine
+ - Tools
+ - Qt Creator 4.x CDB Debugger Support
+### OSX
+1. Install xcode via the app store
+2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
+ - Install the Maintaince tool
+ - Select the following features to install:
+ - Qt 5.11.2
+ - Qt WebEngine
+ - Tools
+ - Qt Creator 4.x CDB Debugger Support
\ No newline at end of file
diff --git a/ScreenPlay/src/create.cpp b/ScreenPlay/src/create.cpp
index 4ff845d5..0bef4c0d 100644
--- a/ScreenPlay/src/create.cpp
+++ b/ScreenPlay/src/create.cpp
@@ -195,7 +195,7 @@ bool Create::createWallpaperVideoPreview()
#endif
#ifdef Q_OS_MACOS
- pro.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
+ proConvertImage.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
#endif
proConvertImage.data()->start();
@@ -245,7 +245,7 @@ bool Create::createWallpaperVideoPreview()
proConvertPreviewMP4.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg.exe");
#endif
#ifdef Q_OS_MACOS
- pro.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
+ proConvertPreviewMP4.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
#endif
emit createWallpaperStateChanged(Create::State::ConvertingPreviewVideo);
@@ -293,7 +293,7 @@ bool Create::createWallpaperVideoPreview()
proConvertGif.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg.exe");
#endif
#ifdef Q_OS_MACOS
- pro.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
+ proConvertGif.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
#endif
connect(this, &Create::abortCreateWallpaper, proConvertGif.data(), &QProcess::kill);
proConvertGif.data()->start();
@@ -410,7 +410,7 @@ bool Create::createWallpaperVideo()
proConvertVideo.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg.exe");
#endif
#ifdef Q_OS_MACOS
- pro.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
+ proConvertVideo.data()->setProgram(QApplication::applicationDirPath() + "/ffmpeg");
#endif
qDebug() << "Start converting video";
diff --git a/ScreenPlayWidget/ScreenPlayWidget.pro b/ScreenPlayWidget/ScreenPlayWidget.pro
index 334d014a..8225caa2 100644
--- a/ScreenPlayWidget/ScreenPlayWidget.pro
+++ b/ScreenPlayWidget/ScreenPlayWidget.pro
@@ -25,16 +25,24 @@ INCLUDEPATH += \
include(../ScreenPlaySDK/Screenplaysdk.pri)
-CONFIG(debug, debug|release) {
-LIBS += -lScreenplaysdkd
- install_it.path = $${OUT_PWD}/debug/
- QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/debug
- } else {
-LIBS += -lScreenplaysdk
- install_it.path = $${OUT_PWD}/release/
- QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/release
- }
-QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK
+macx: {
+QMAKE_LIBDIR += $$OUT_PWD/
+install_it.path = $${OUT_PWD}/../ScreenPlaySDK
+}
+
+!macx: {
+ CONFIG(debug, debug|release) {
+ LIBS += -lScreenplaysdkd
+ install_it.path = $${OUT_PWD}/debug/
+ QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/debug
+ } else {
+ LIBS += -lScreenplaysdk
+ install_it.path = $${OUT_PWD}/release/
+ QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/release
+ }
+ QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK
+}
+
# Additional import path used to resolve QML modules just for Qt Quick Designer