Skip to content

Commit

Permalink
update target obs version / move to github action to build for win32.
Browse files Browse the repository at this point in the history
  • Loading branch information
sorayuki committed Jan 24, 2021
1 parent c7ecf44 commit 0b2b92c
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 87 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: windows-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: build
run: githubci\build.bat

- name: Upload a Build Artifact
uses: actions/[email protected]
with:
name: obs-multi-rtmp
path: dist
15 changes: 1 addition & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
OBS_VER: "25.0.8"
OBS_VER: "26.1.2"

- APPVEYOR_BUILD_WORKER_IMAGE: macos
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004

for:
- matrix:
only:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

install:
- pwsh: ci/install.ps1 -OBS_VER "$Env:OBS_VER"

build_script:
- pwsh: ./build.ps1 -OBS_BIN_DIR32 "../OBS-Studio-${Env:OBS_VER}-Full-x86" -OBS_BIN_DIR64 "../OBS-Studio-${Env:OBS_VER}-Full-x64" -OBS_SRC_DIR "../obs-studio-${Env:OBS_VER}"

artifacts:
- path: "*.zip"

- matrix:
only:
- APPVEYOR_BUILD_WORKER_IMAGE: macos
Expand Down
31 changes: 0 additions & 31 deletions build.ps1

This file was deleted.

37 changes: 0 additions & 37 deletions ci/install.ps1

This file was deleted.

10 changes: 5 additions & 5 deletions docs/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ zipファイルを OBS のフォルダーに解凍してインストール完了

# 要求環境

OBS-Studio バージョン 25.0.0 以降
また、OBS-Studio 本体は QT 5.10.1 と共にビルドしたバージョン
OBS-Studio バージョン 26.1.1 以降
また、OBS-Studio 本体は QT 5.15.2 と共にビルドしたバージョン

確認済:
obs-studio 25.0.1 ~ obs-studio 25.0.3
obs-studio 26.1.1


# よくあるご質問
Expand All @@ -60,12 +60,12 @@ A: このプラグインは OBS 本体のエンコーダーと共有している
# How to Build

1. Prepare environment
1. Put official release OBS 25.0 into obs-bin directory.
1. Put official release OBS 26.1.2 into obs-bin directory.
2. Extract OBS source code of same version as binary to obs-src
3. Download Qt that obs-bin uses. Which can be found in CI\install-qt-win.cmd

2. Configure
Use cmake to configure this project. must use VS2017 or higher.
Use cmake to configure this project. must use VS2019 or higher.
cmake's QTDIR variable is set to the path of QT in the same version as obs uses.

Set CMAKE_BUILD_TYPE to Release.
Expand Down
28 changes: 28 additions & 0 deletions githubci/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
set OBSBIN_VER=26.1.1
set OBSSRC_VER=26.1.2

curl -o obs-bin-x86.zip "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-%OBSBIN_VER%-Full-x86.zip"
curl -o obs-bin-x64.zip "https://cdn-fastly.obsproject.com/downloads/OBS-Studio-%OBSBIN_VER%-Full-x64.zip"
git clone --depth=1 -b %OBSSRC_VER% "https://github.com/obsproject/obs-studio.git" obs-src
call obs-src\CI\install-qt-win.cmd
cmake -E make_directory obs-bin
pushd obs-bin
cmake -E tar zxf ..\obs-bin-x86.zip
cmake -E tar zxf ..\obs-bin-x64.zip
popd

set QTDIR32=-DQTDIR="C:/QtDep/5.15.2/msvc2019"
set QTDIR64=-DQTDIR="C:/QtDep/5.15.2/msvc2019_64"

cmake %QTDIR32% -G "Visual Studio 16 2019" -A Win32 -B build_x86 -S . -DCMAKE_INSTALL_PREFIX=dist
cmake --build build_x86 --config Release
cmake --install build_x86 --config Release

cmake %QTDIR64% -G "Visual Studio 16 2019" -A x64 -B build_x64 -S . -DCMAKE_INSTALL_PREFIX=dist
cmake --build build_x64 --config Release
cmake --install build_x64 --config Release

if not exist dist\nul exit /b
pushd dist
cmake -E tar cf ..\release.zip --format=zip .
popd

0 comments on commit 0b2b92c

Please sign in to comment.