moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 11f659aadb
commit 91b787a5be
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/app.pro
+4 -2
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 {
libs
+1 -1
Submodule libs updated: ecd79f7bbd...b6d497c9c2
moonlight-common-c/moonlight-common-c.pro
+10
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 {