From 760e13f10dff57f48877dc47dca79a1490c6bc1f Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 5 Jun 2016 20:41:14 -0400 Subject: [PATCH] windows gstreamer --- .appveyor.yml | 16 ++++++++++++++++ src/VideoStreaming/VideoStreaming.pri | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 0fa043f1d..51c614eee 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,6 +25,22 @@ install: Write-Host "Installing..." cmd /c start /wait $exePath /S Write-Host "Installed" -ForegroundColor Green + - ps: | + Write-Host "Installing GStreamer..." -ForegroundColor Cyan + $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.8.1.msi" + Write-Host "Downloading..." + (New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-x86-1.8.1.msi', $msiPath) + Write-Host "Installing..." + cmd /c start /wait msiexec /package $msiPath /passive + Write-Host "Installed" -ForegroundColor Green + - ps: | + Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan + $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.8.1.msi" + Write-Host "Downloading..." + (New-Object Net.WebClient).DownloadFile('https://gstreamer.freedesktop.org/data/pkg/windows/1.8.1/gstreamer-1.0-devel-x86-1.8.1.msi', $msiPath) + Write-Host "Installing..." + cmd /c start /wait msiexec /package $msiPath /passive + Write-Host "Installed" -ForegroundColor Green build_script: - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri index d7d690a9e..3858d1b4c 100644 --- a/src/VideoStreaming/VideoStreaming.pri +++ b/src/VideoStreaming/VideoStreaming.pri @@ -59,6 +59,26 @@ LinuxBuild { $$GST_ROOT/lib/gstreamer-1.0/include \ $$GST_ROOT/lib/glib-2.0/include } + + COPY_FILE_LIST = \ + $$GST_ROOT\\bin\\libffi-6.dll \ + $$GST_ROOT\\bin\\libglib-2.0-0.dll \ + $$GST_ROOT\\bin\\libgmodule-2.0-0.dll \ + $$GST_ROOT\\bin\\libgobject-2.0-0.dll \ + $$GST_ROOT\\bin\\libgstbase-1.0-0.dll \ + $$GST_ROOT\\bin\\libgstreamer-1.0-0.dll \ + $$GST_ROOT\\bin\\libgstvideo-1.0-0.dll \ + $$GST_ROOT\\bin\\libintl-8.dll \ + $$GST_ROOT\\bin\\liborc-0.4-0.dll \ + $$GST_ROOT\\bin\\libwinpthread-1.dll \ + + DESTDIR_WIN = $$replace(DESTDIR, "/", "\\") + + for(COPY_FILE, COPY_FILE_LIST) { + QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\" + } + QMAKE_POST_LINK += $$escape_expand(\\n) + } else:AndroidBuild { #- gstreamer assumed to be installed in $$PWD/../../android/gstreamer-1.0-android-armv7-1.5.2 GST_ROOT = $$PWD/../../gstreamer-1.0-android-armv7-1.5.2 -- 2.22.0