diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 3e2691cc..202a854a 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -87,12 +87,13 @@ add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml}) if(WIN32) # Icon target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc) + + # Disable console window on Windows + # https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows + set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true) endif() -# Disable console window on Windows -# https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows -set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true) target_compile_definitions(${PROJECT_NAME} PRIVATE "GIT_VERSION=${GIT_VERSION}") diff --git a/ScreenPlay/src/util.cpp b/ScreenPlay/src/util.cpp index d1858f55..1b00287a 100644 --- a/ScreenPlay/src/util.cpp +++ b/ScreenPlay/src/util.cpp @@ -19,7 +19,6 @@ Util::Util(QNetworkAccessManager* networkAccessManager, QObject* parent) // Fix log access vilation on quit QObject::connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, this, []() { utilPointer = nullptr; }); - qRegisterMetaType(); qmlRegisterUncreatableType("ScreenPlay.QMLUtilities", 1, 0, "QMLUtilities", "Error only for enums"); // In release mode redirect messages to logging otherwhise we break the nice clickable output :( diff --git a/ScreenPlay/src/util.h b/ScreenPlay/src/util.h index e2aadab6..e608a8cd 100644 --- a/ScreenPlay/src/util.h +++ b/ScreenPlay/src/util.h @@ -85,7 +85,6 @@ class Util : public QObject { public: explicit Util(QNetworkAccessManager* networkAccessManager, QObject* parent = nullptr); - QString debugMessages() const { return m_debugMessages; @@ -135,8 +134,6 @@ public slots: emit requestToggleWallpaperConfiguration(); } - - void appendDebugMessages(QString debugMessages) { if (m_debugMessages.size() > 10000) { diff --git a/install_dependencies_windows.bat b/install_dependencies_windows.bat index 8d7c8b55..92db827c 100644 --- a/install_dependencies_windows.bat +++ b/install_dependencies_windows.bat @@ -11,6 +11,9 @@ call bootstrap-vcpkg.bat rem Install vcpkg dependencies vcpkg.exe install openssl --triplet x64-windows --recurse +cd .. +cd .. + rem Donwload ffmpeg curl.exe -L https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-full_build.zip --output ffmpeg.zip @@ -20,8 +23,12 @@ rem --strip-components 2 removes folder tar -xvf ffmpeg.zip --strip-components 2 ffmpeg-4.3.1-full_build/bin rem Remove not used ffplay -rm ffplay.exe +DEL ffplay.exe rem Move ffmpeg into folder -mv ffmpeg.exe Common/ffmpeg -mv ffprobe.exe Common/ffmpeg +move /Y ffmpeg.exe Common/ffmpeg +move /Y ffprobe.exe Common/ffmpeg + +DEL ffmpeg.zip + +pause \ No newline at end of file