Commit 59c31ef8 authored by nanahira's avatar nanahira

Merge branch 'patch-miniaudio' of github.com:Fluorohydride/ygopro

parents 705fd033 df24544f
...@@ -95,6 +95,9 @@ jobs: ...@@ -95,6 +95,9 @@ jobs:
if: matrix.audiolib == 'miniaudio' if: matrix.audiolib == 'miniaudio'
run: | run: |
git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
cd miniaudio
xcopy /Y extras\miniaudio_split\miniaudio.* .
cd ..
- name: Download ogg - name: Download ogg
if: matrix.audiolib == 'miniaudio' if: matrix.audiolib == 'miniaudio'
...@@ -295,6 +298,9 @@ jobs: ...@@ -295,6 +298,9 @@ jobs:
- name: Download miniaudio - name: Download miniaudio
run: | run: |
git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
cd miniaudio
cp extras/miniaudio_split/miniaudio.* .
cd ..
- name: Download irrlicht - name: Download irrlicht
run: | run: |
...@@ -387,6 +393,9 @@ jobs: ...@@ -387,6 +393,9 @@ jobs:
- name: Download miniaudio - name: Download miniaudio
run: | run: |
git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
cd miniaudio
cp extras/miniaudio_split/miniaudio.* .
cd ..
- name: Download irrlicht - name: Download irrlicht
run: | run: |
......
...@@ -42,7 +42,7 @@ project "YGOPro" ...@@ -42,7 +42,7 @@ project "YGOPro"
defines { "YGOPRO_USE_AUDIO" } defines { "YGOPRO_USE_AUDIO" }
if AUDIO_LIB == "miniaudio" then if AUDIO_LIB == "miniaudio" then
defines { "YGOPRO_USE_MINIAUDIO" } defines { "YGOPRO_USE_MINIAUDIO" }
includedirs { "../miniaudio/extras/miniaudio_split" } includedirs { "../miniaudio" }
links { "miniaudio" } links { "miniaudio" }
if MINIAUDIO_SUPPORT_OPUS_VORBIS then if MINIAUDIO_SUPPORT_OPUS_VORBIS then
defines { "YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS" } defines { "YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS" }
......
project "miniaudio" project "miniaudio"
kind "StaticLib" kind "StaticLib"
files { "extras/miniaudio_split/miniaudio.*" } files { "miniaudio.c", "miniaudio.h" }
defines { "MA_NO_ENCODING", "MA_NO_GENERATION", "MA_NO_NEON" } defines { "MA_NO_ENCODING", "MA_NO_GENERATION", "MA_NO_NEON" }
if MINIAUDIO_SUPPORT_OPUS_VORBIS then if MINIAUDIO_SUPPORT_OPUS_VORBIS then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment