Unverified Commit 19066fe3 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Windows build fix

Pairing not supported under Windows
Remove zlib dependency for Windows.

Fixes https://github.com/mavlink/qgroundcontrol/issues/7954
parent 24c59355
...@@ -107,7 +107,6 @@ SOURCES += \ ...@@ -107,7 +107,6 @@ SOURCES += \
MacBuild { MacBuild {
INCLUDEPATH += \ INCLUDEPATH += \
$$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers
LIBS += \ LIBS += \
-F$$BASEDIR/libs/lib/Frameworks \ -F$$BASEDIR/libs/lib/Frameworks \
-framework SDL2 -framework SDL2
...@@ -115,8 +114,6 @@ MacBuild { ...@@ -115,8 +114,6 @@ MacBuild {
PKGCONFIG = sdl2 PKGCONFIG = sdl2
} else:WindowsBuild { } else:WindowsBuild {
INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include
INCLUDEPATH += $$BASEDIR/libs/zlib/Windows/include
contains(QT_ARCH, i386) { contains(QT_ARCH, i386) {
INCLUDEPATH += $$BASEDIR/libs/OpenSSL/Windows/x86/include INCLUDEPATH += $$BASEDIR/libs/OpenSSL/Windows/x86/include
LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86 LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86
...@@ -126,12 +123,9 @@ MacBuild { ...@@ -126,12 +123,9 @@ MacBuild {
LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64 LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64
LIBS += -L$$BASEDIR/libs/OpenSSL/Windows/x64/lib LIBS += -L$$BASEDIR/libs/OpenSSL/Windows/x64/lib
} }
LIBS += -L$$BASEDIR/libs/zlib/Windows/libs
LIBS += \ LIBS += \
-lSDL2main \ -lSDL2main \
-lSDL2 \ -lSDL2
-lz \
-llibeay32
} }
# Include Android OpenSSL libs in order to make Qt OpenSSL support work # Include Android OpenSSL libs in order to make Qt OpenSSL support work
...@@ -163,6 +157,10 @@ contains(DEFINES, QGC_ENABLE_PAIRING) { ...@@ -163,6 +157,10 @@ contains(DEFINES, QGC_ENABLE_PAIRING) {
DEFINES -= QGC_ENABLE_NFC DEFINES -= QGC_ENABLE_NFC
DEFINES -= QGC_ENABLE_PAIRING DEFINES -= QGC_ENABLE_PAIRING
} }
} else:WindowsBuild {
#- Pairing is not supported on Windows
DEFINES -= QGC_ENABLE_NFC
DEFINES -= QGC_ENABLE_PAIRING
} else { } else {
LIBS += -lcrypto -lz LIBS += -lcrypto -lz
AndroidBuild { AndroidBuild {
...@@ -194,7 +192,6 @@ contains (DEFINES, DISABLE_ZEROCONF) { ...@@ -194,7 +192,6 @@ contains (DEFINES, DISABLE_ZEROCONF) {
message("Skipping support for Zeroconf (unsupported platform)") message("Skipping support for Zeroconf (unsupported platform)")
} }
# #
# [OPTIONAL] AirMap Support # [OPTIONAL] AirMap Support
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment