diff --git a/app/app.pro b/app/app.pro index 50432b78..35d9d76e 100644 --- a/app/app.pro +++ b/app/app.pro @@ -92,7 +92,10 @@ unix:!macx { } win32 { LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lopus -ld3dx9 - CONFIG += ffmpeg soundio + CONFIG += ffmpeg +} +win32:!winrt { + CONFIG += soundio } macx { LIBS += -lssl -lcrypto -lavcodec.58 -lavutil.56 -lopus -framework SDL2 -framework SDL2_ttf @@ -211,7 +214,7 @@ config_SLVideo { SOURCES += streaming/video/sl.cpp HEADERS += streaming/video/sl.h } -win32 { +win32:!winrt { message(DXVA2 renderer selected) SOURCES += \ @@ -265,12 +268,14 @@ else:unix: LIBS += -L$$OUT_PWD/../qmdnsengine/ -lqmdnsengine INCLUDEPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine DEPENDPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio -else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio +!winrt { + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio + else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio + else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio -INCLUDEPATH += $$PWD/../soundio/libsoundio -DEPENDPATH += $$PWD/../soundio/libsoundio + INCLUDEPATH += $$PWD/../soundio/libsoundio + DEPENDPATH += $$PWD/../soundio/libsoundio +} win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/release/ -lh264bitstream else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/debug/ -lh264bitstream @@ -279,11 +284,13 @@ else:unix: LIBS += -L$$OUT_PWD/../h264bitstream/ -lh264bitstream INCLUDEPATH += $$PWD/../h264bitstream/h264bitstream DEPENDPATH += $$PWD/../h264bitstream/h264bitstream -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/release/ -lAntiHooking -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/debug/ -lAntiHooking +!winrt { + win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/release/ -lAntiHooking + else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/debug/ -lAntiHooking -INCLUDEPATH += $$PWD/../AntiHooking -DEPENDPATH += $$PWD/../AntiHooking + INCLUDEPATH += $$PWD/../AntiHooking + DEPENDPATH += $$PWD/../AntiHooking +} defineTest(copyToDestDir) { files = $$1 diff --git a/app/cli/commandlineparser.cpp b/app/cli/commandlineparser.cpp index 4f2f6ce5..e10e7501 100644 --- a/app/cli/commandlineparser.cpp +++ b/app/cli/commandlineparser.cpp @@ -59,7 +59,7 @@ public: void showMessage(QString message, MessageType type) const { - #if defined(Q_OS_WIN) + #if defined(Q_OS_WIN32) UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND; flags |= (type == Info ? MB_ICONINFORMATION : MB_ICONERROR); QString title = "Moonlight"; diff --git a/app/main.cpp b/app/main.cpp index 0a0634c5..c6f71b1e 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -345,10 +345,17 @@ int main(int argc, char *argv[]) return new AutoUpdateChecker(); }); +#ifndef Q_OS_WINRT // Use the dense material dark theme by default if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_STYLE")) { qputenv("QT_QUICK_CONTROLS_STYLE", "Material"); } +#else + // Use universal dark on WinRT + if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_STYLE")) { + qputenv("QT_QUICK_CONTROLS_STYLE", "Universal"); + } +#endif if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MATERIAL_THEME")) { qputenv("QT_QUICK_CONTROLS_MATERIAL_THEME", "Dark"); } diff --git a/moonlight-qt.pro b/moonlight-qt.pro index 8a4ee680..2dfe732c 100644 --- a/moonlight-qt.pro +++ b/moonlight-qt.pro @@ -3,15 +3,18 @@ SUBDIRS = \ moonlight-common-c \ qmdnsengine \ app \ - soundio \ h264bitstream # Build the dependencies in parallel before the final app -app.depends = qmdnsengine moonlight-common-c soundio h264bitstream -win32 { +app.depends = qmdnsengine moonlight-common-c h264bitstream +win32:!winrt { SUBDIRS += AntiHooking app.depends += AntiHooking } +!winrt { + SUBDIRS += soundio + app.depends += soundio +} # Support debug and release builds from command line for CI CONFIG += debug_and_release