Skip to content

Commit

Permalink
5
Browse files Browse the repository at this point in the history
  • Loading branch information
RealChuan committed Jun 6, 2024
1 parent 137ea79 commit c0e740b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/qmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ jobs:
shell: pwsh
run: |
..\scripts\windows\setVsDev.ps1 -VersionRange "[16.0,17.0)" -Arch "x64"
& qmake ./../. -spec win32-msvc "CONFIG+=qtquickcompiler"
& qmake ./../.
& jom
working-directory: build
- name: ubuntu-build
if: startsWith(matrix.os, 'ubuntu')
shell: bash
run: |
qmake ./../. -spec linux-g++ "CONFIG+=qtquickcompiler" BUILD_MPV="ON"
qmake ./../.
make -j $(nproc)
working-directory: build
- name: macos-build
if: startsWith(matrix.os, 'macos')
shell: bash
run: |
qmake ./../. -spec macx-clang "CONFIG+=qtquickcompiler" QMAKE_APPLE_DEVICE_ARCHS="arm64" BUILD_MPV="ON"
qmake ./../. QMAKE_APPLE_DEVICE_ARCHS="arm64"
make -j $(sysctl -n hw.ncpu)
working-directory: build
14 changes: 11 additions & 3 deletions examples/examples.pro
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
TEMPLATE = subdirs
CONFIG += ordered BUILD_MPV
CONFIG += ordered

SUBDIRS += \
ffmpegplayer \
ffmpegtranscoder

contains(BUILD_MPV, ON) {
SUBDIRS += mpvplayer
win32 {
exists("C:/3rd/x64/mpv/include"){
SUBDIRS += mpvplayer
}
}

macx {
exists("/opt/homebrew/include/mpv"){
SUBDIRS += mpvplayer
}
}
2 changes: 1 addition & 1 deletion src/mpv/mpv.pri
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ macx {

unix:!macx{
LIBS += -lmpv
}
}
12 changes: 10 additions & 2 deletions src/src.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ SUBDIRS += \
3rdparty \
ffmpeg

contains(BUILD_MPV, ON) {
SUBDIRS += mpv
win32 {
exists("C:/3rd/x64/mpv/include"){
SUBDIRS += mpv
}
}

macx {
exists("/opt/homebrew/include/mpv"){
SUBDIRS += mpv
}
}

0 comments on commit c0e740b

Please sign in to comment.