From 9c7f81845d0b43097bd786234618f90a1e5d1125 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Sun, 28 Apr 2024 23:07:33 +0200 Subject: [PATCH] Add build of LibFFmpeg as submodule --- .github/workflows/Build.yml | 8 ++++++++ YUView.pro | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index e2acbfaec..01c85e81f 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -20,6 +20,8 @@ jobs: QMAKE_COMMAND: qmake6 steps: - uses: actions/checkout@v4 + with: + submodules: "recursive" - run: git fetch --prune --unshallow - name: Install Linux packages run: | @@ -41,6 +43,8 @@ jobs: - os: macos-12 steps: - uses: actions/checkout@v4 + with: + submodules: "recursive" - run: git fetch --prune --unshallow - name: Install packages run: | @@ -78,6 +82,8 @@ jobs: CPU_COUNT_COMMAND: sysctl -n hw.logicalcpu steps: - uses: actions/checkout@v4 + with: + submodules: "recursive" - run: git fetch --prune --unshallow - name: Install Qt base run: | @@ -156,6 +162,8 @@ jobs: QT_FILE: qtBase_6.5.2_win2019.zip steps: - uses: actions/checkout@v4 + with: + submodules: "recursive" - uses: ilammy/msvc-dev-cmd@v1 - run: git fetch --prune --unshallow - name: Install Qt base diff --git a/YUView.pro b/YUView.pro index b34aa2300..db30d656e 100644 --- a/YUView.pro +++ b/YUView.pro @@ -1,9 +1,11 @@ TEMPLATE = subdirs -SUBDIRS = YUViewLib YUViewApp +SUBDIRS = YUViewLib YUViewApp LibFFmpeg YUViewApp.subdir = YUViewApp YUViewLib.subdir = YUViewLib +LibFFmpeg.subdir = submodules/LibFFmpeg +YUViewLib.depends = LibFFmpeg YUViewApp.depends = YUViewLib UNITTESTS {