OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2024-10-10 22:04:23 +08:00
commit 55940ba21d
14 changed files with 717 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/continuous_integration.yml vendored
View file

@ -21,14 +21,14 @@ jobs:
build_type: Debug
- name: macOS
os: macos-12
deps_cmdline: brew install libvpx webp
os: macos-14
deps_cmdline: brew install libvpx
build_type: Release
- name: macOS
os: macos-12
os: macos-14
extra_options: -G Xcode -DDYN_OPENAL=OFF
deps_cmdline: brew install libvpx webp
deps_cmdline: brew install libvpx
build_type: Debug
- name: Linux GCC 9
@ -66,9 +66,9 @@ jobs:
fi
mkdir build
if [[ "${{ runner.os }}" == 'macOS' ]]; then
export ZMUSIC_PACKAGE=zmusic-1.1.9-macos.tar.xz
export ZMUSIC_PACKAGE=zmusic-1.1.14-macos-arm.tar.xz
elif [[ "${{ runner.os }}" == 'Linux' ]]; then
export ZMUSIC_PACKAGE=zmusic-1.1.9-linux.tar.xz
export ZMUSIC_PACKAGE=zmusic-1.1.14-linux.tar.xz
fi
if [[ -n "${ZMUSIC_PACKAGE}" ]]; then
cd build