mirror of
https://github.com/moonlight-stream/moonlight-qt.git
synced 2025-07-01 23:35:55 +00:00
Update SDL and switch to arch-specific headers on Windows
SDL -> e2ade2b
This commit is contained in:
parent
11f659aadb
commit
91b787a5be
@ -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
2
libs
@ -1 +1 @@
|
|||||||
Subproject commit ecd79f7bbdbf718ccd6bd348d2d0616d7a604551
|
Subproject commit b6d497c9c2e0bb7da98519ea45e5c75bc19b6451
|
@ -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 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user