Commit 947c14e4 authored by mercury233's avatar mercury233

test

parent 60ef8e15
...@@ -279,8 +279,7 @@ jobs: ...@@ -279,8 +279,7 @@ jobs:
- name: Use premake to generate make files - name: Use premake to generate make files
run: | run: |
./premake5 gmake \ ./premake5 gmake \
--freetype-include-dir="/usr/include/freetype2" \ --freetype-include-dir="/usr/include/freetype2"
--opus-include-dir="/usr/include/opus" \
- name: Make - name: Make
run: | run: |
...@@ -376,7 +375,6 @@ jobs: ...@@ -376,7 +375,6 @@ jobs:
./premake5 gmake \ ./premake5 gmake \
--cc=clang \ --cc=clang \
--freetype-include-dir="/usr/local/include/freetype2" \ --freetype-include-dir="/usr/local/include/freetype2" \
--opus-include-dir="/usr/local/include/opus" \
--irrlicht-include-dir="../irrlicht/include" \ --irrlicht-include-dir="../irrlicht/include" \
--irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release" --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
......
...@@ -44,6 +44,7 @@ project "YGOPro" ...@@ -44,6 +44,7 @@ project "YGOPro"
links { "miniaudio" } links { "miniaudio" }
if not BUILD_OPUS_VORBIS and MINIAUDIO_SUPPORT_OPUS_VORBIS then if not BUILD_OPUS_VORBIS and MINIAUDIO_SUPPORT_OPUS_VORBIS then
links { "opusfile", "vorbisfile" } links { "opusfile", "vorbisfile" }
libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR }
end end
end end
......
...@@ -29,12 +29,7 @@ project "miniaudio" ...@@ -29,12 +29,7 @@ project "miniaudio"
"external/vorbis/include" "external/vorbis/include"
} }
else else
print("OPUS_LIB_DIR:")
print(OPUS_LIB_DIR)
print("VORBIS_LIB_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 }
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