Skip to content
This repository has been archived by the owner on Dec 15, 2020. It is now read-only.

Commit

Permalink
Support for DAL plugin built as a universal binary (#240)
Browse files Browse the repository at this point in the history
* Separate universal dal-plugin build from x86-only obs-plugin build

* Try building on macOS Big Sur instead

* Temporarily use MACOSX_DEPLOYMENT_TARGET 10.015

* Try the CPATH fix

* Try a different CPATH

* Also try LIBRARY_PATH

* Dump cmake version because I'm curious

* Try newer cmake

* Sanity check -- only build x86

* Continue to beat my head against the wall

* Bring back arm64 now with updated cmake

* Try big sur again with updated cmake

* Use setup-xcode to update xcode (hopefully)

* Don't blow away obs plugin
  • Loading branch information
johnboiles committed Nov 26, 2020
1 parent 4bd5852 commit 4d55644
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
runs-on: macos-latest

steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable

- name: Checkout obs-mac-virtualcam
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -82,7 +86,7 @@ jobs:
cmake -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DDISABLE_PYTHON=ON ..
make -j
- name: Build the plugin
- name: Build the OBS plugin
run: |
mkdir obs-mac-virtualcam/build
cd obs-mac-virtualcam/build
Expand All @@ -92,7 +96,18 @@ jobs:
-DOBS_FRONTEND_LIB:STRING=$GITHUB_WORKSPACE/obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib \
-DQTDIR:STRING=/tmp/obsdeps ..
make -j
make -j obs-plugin
- name: Build the DAL plugin
run: |
cd obs-mac-virtualcam/build
cmake -DLIBOBS_INCLUDE_DIR:STRING=$GITHUB_WORKSPACE/obs-studio/libobs \
-DLIBOBS_LIB:STRING=$GITHUB_WORKSPACE/obs-studio/build/libobs/libobs.dylib \
-DOBS_FRONTEND_LIB:STRING=$GITHUB_WORKSPACE/obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib \
-DQTDIR:STRING=/tmp/obsdeps -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" ..
make -j dal-plugin
- name: Fix runtime QT deps
run: |
Expand Down

0 comments on commit 4d55644

Please sign in to comment.