Use msys2 for Windows Build
This commit is contained in:
@@ -129,43 +129,29 @@ jobs:
|
|||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
- name: MSYS2 Setup
|
||||||
- name: Install boost
|
uses: msys2/setup-msys2@v2
|
||||||
uses: MarkusJx/install-boost@v2.1.0
|
|
||||||
id: install-boost
|
|
||||||
with:
|
with:
|
||||||
# REQUIRED: Specify the required boost version
|
update: true
|
||||||
# A list of supported versions can be found here:
|
install: >-
|
||||||
# https://github.com/actions/boost-versions/blob/main/versions-manifest.json
|
base-devel
|
||||||
boost_version: 1.78.0
|
git
|
||||||
# OPTIONAL: Specify a custom install location
|
mingw-w64-x86_64-binutils
|
||||||
boost_install_dir: 'C:'
|
mingw-w64-x86_64-openssl
|
||||||
# OPTIONAL: Specify a platform version
|
mingw-w64-x86_64-cmake
|
||||||
platform_version: 2019
|
mingw-w64-x86_64-toolchain
|
||||||
toolset: mingw
|
mingw-w64-x86_64-opus
|
||||||
|
mingw-w64-x86_64-x265
|
||||||
# NOTE: If a boost version matching all requirements cannot be found,
|
mingw-w64-x86_64-boost
|
||||||
# this build step will fail
|
git
|
||||||
- name: Setup Windows
|
yasm
|
||||||
run: |
|
nasm
|
||||||
C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make"
|
diffutils
|
||||||
# - name: Build Windows
|
make
|
||||||
# env:
|
|
||||||
# BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
|
|
||||||
# run: |
|
|
||||||
# mkdir sunshine-windows-build && cd sunshine-windows-build
|
|
||||||
# set PATH=C:\msys64\mingw64\bin
|
|
||||||
# set BOOST_ROOT=C:\boost
|
|
||||||
# set BOOST_INCLUDEDIR=C:\boost
|
|
||||||
# set BOOST_LIBRARYDIR=C:\boost\lib
|
|
||||||
# cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
|
|
||||||
# mingw32-make -j2
|
|
||||||
- name: Build Windows
|
- name: Build Windows
|
||||||
env:
|
shell: msys2 {0}
|
||||||
BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
|
|
||||||
run: |
|
run: |
|
||||||
mkdir sunshine-windows-build && cd sunshine-windows-build
|
mkdir sunshine-windows-build && cd sunshine-windows-build
|
||||||
set PATH=C:\msys64\mingw64\bin
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" ..
|
cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" ..
|
||||||
mingw32-make -j2
|
mingw32-make -j2
|
||||||
- name: Package Windows
|
- name: Package Windows
|
||||||
|
|||||||
Reference in New Issue
Block a user