jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update SDL and switch to arch-specific headers on Windows

Browse source 
SDL -> e2ade2b
This commit is contained in:
Cameron Gutman 2021-12-11 14:06:26 -06:00
commit 91b787a5be
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/app.pro
View file

@ -33,18 +33,20 @@ DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
win32 { win32 {
INCLUDEPATH += $$PWD/../libs/windows/include
contains(QT_ARCH, i386) { contains(QT_ARCH, i386) {
LIBS += -L$$PWD/../libs/windows/lib/x86 LIBS += -L$$PWD/../libs/windows/lib/x86
INCLUDEPATH += $$PWD/../libs/windows/include/x86
} }
contains(QT_ARCH, x86_64) { contains(QT_ARCH, x86_64) {
LIBS += -L$$PWD/../libs/windows/lib/x64 LIBS += -L$$PWD/../libs/windows/lib/x64
INCLUDEPATH += $$PWD/../libs/windows/include/x64
} }
contains(QT_ARCH, arm64) { contains(QT_ARCH, arm64) {
LIBS += -L$$PWD/../libs/windows/lib/arm64 LIBS += -L$$PWD/../libs/windows/lib/arm64
INCLUDEPATH += $$PWD/../libs/windows/include/arm64
} }
INCLUDEPATH += $$PWD/../libs/windows/include
LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
} }
macx { macx {

2
libs

@ -1 +1 @@
Subproject commit ecd79f7bbdbf718ccd6bd348d2d0616d7a604551 Subproject commit b6d497c9c2e0bb7da98519ea45e5c75bc19b6451

10
moonlight-common-c/moonlight-common-c.pro
View file

@ -19,6 +19,16 @@ CONFIG += warn_off
include(../globaldefs.pri) include(../globaldefs.pri)
win32 { win32 {
contains(QT_ARCH, i386) {
INCLUDEPATH += $$PWD/../libs/windows/include/x86
}
contains(QT_ARCH, x86_64) {
INCLUDEPATH += $$PWD/../libs/windows/include/x64
}
contains(QT_ARCH, arm64) {
INCLUDEPATH += $$PWD/../libs/windows/include/arm64
}
INCLUDEPATH += $$PWD/../libs/windows/include INCLUDEPATH += $$PWD/../libs/windows/include
} }
macx { macx {