Commit f6495d00 authored by mercury233's avatar mercury233

fix

parent ef6595e6
...@@ -373,8 +373,6 @@ jobs: ...@@ -373,8 +373,6 @@ jobs:
- name: Use premake to generate make files (Intel) - name: Use premake to generate make files (Intel)
if: runner.arch == 'X64' if: runner.arch == 'X64'
run: | run: |
ls /usr/local/include
ls /usr/local/include/opus
./premake5 gmake \ ./premake5 gmake \
--cc=clang \ --cc=clang \
--freetype-include-dir="/usr/local/include/freetype2" \ --freetype-include-dir="/usr/local/include/freetype2" \
...@@ -385,8 +383,7 @@ jobs: ...@@ -385,8 +383,7 @@ jobs:
- name: Use premake to generate make files (ARM64) - name: Use premake to generate make files (ARM64)
if: runner.arch == 'ARM64' if: runner.arch == 'ARM64'
run: | run: |
ls /opt/homebrew/include ls /opt/homebrew/lib
ls /opt/homebrew/include/opus
./premake5 gmake \ ./premake5 gmake \
--cc=clang \ --cc=clang \
--event-include-dir="/opt/homebrew/include" \ --event-include-dir="/opt/homebrew/include" \
......
...@@ -42,6 +42,9 @@ project "YGOPro" ...@@ -42,6 +42,9 @@ project "YGOPro"
defines { "YGOPRO_USE_AUDIO" } defines { "YGOPRO_USE_AUDIO" }
includedirs { "../miniaudio" } includedirs { "../miniaudio" }
links { "miniaudio" } links { "miniaudio" }
if not BUILD_OPUS_VORBIS and MINIAUDIO_SUPPORT_OPUS_VORBIS then
links { "opusfile", "vorbis" }
end
end end
filter "system:windows" filter "system:windows"
......
...@@ -29,13 +29,12 @@ project "miniaudio" ...@@ -29,13 +29,12 @@ project "miniaudio"
"external/vorbis/include" "external/vorbis/include"
} }
else else
print("OPUS_INCLUDE_DIR:") print("OPUS_LIB_DIR:")
print(OPUS_INCLUDE_DIR) print(OPUS_LIB_DIR)
print("VORBIS_INCLUDE_DIR:") print("VORBIS_LIB_DIR:")
print(VORBIS_INCLUDE_DIR) print(VORBIS_LIB_DIR)
includedirs { OPUS_INCLUDE_DIR, VORBIS_INCLUDE_DIR } includedirs { OPUS_INCLUDE_DIR, VORBIS_INCLUDE_DIR }
libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR } libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR }
links { "opusfile", "vorbis" }
end end
end end
......
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