Browse Source

Merge pull request #8318 from andrewvoznytsa/pr-windows-build-fix

Windows build fix
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
27ec19625a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      qmlglsink.cmake
  2. 2
      qmlglsink.pri

2
qmlglsink.cmake

@ -41,7 +41,7 @@ elseif(APPLE) @@ -41,7 +41,7 @@ elseif(APPLE)
elseif(IOS)
target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_MAC)
elseif(WIN32)
target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_WIN32)
target_compile_definitions(gst_plugins_good PUBLIC HAVE_QT_WIN32 HAVE_QT_QPA_HEADER)
# TODO: use FindOpenGL?
target_link_libraries(gst_plugins_good PUBLIC opengl32.lib user32.lib)

2
qmlglsink.pri

@ -8,7 +8,7 @@ LinuxBuild { @@ -8,7 +8,7 @@ LinuxBuild {
} else:iOSBuild {
DEFINES += HAVE_QT_IOS
} else:WindowsBuild {
DEFINES += HAVE_QT_WIN32
DEFINES += HAVE_QT_WIN32 HAVE_QT_QPA_HEADER
LIBS += opengl32.lib user32.lib
} else:AndroidBuild {
DEFINES += HAVE_QT_ANDROID

Loading…
Cancel
Save