sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libvorbisfile dependency

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-30 03:23:40 +02:00
parent d5c27a756b
commit 312a6d3ba8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Audio/Formats/libvorbisLoader.cpp
View File

@@ -16,7 +16,10 @@
#include <Nazara/Core/Stream.hpp> #include <Nazara/Core/Stream.hpp>
#include <optional> #include <optional>
#include <set> #include <set>
#define OV_EXCLUDE_STATIC_CALLBACKS
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>
#include <Nazara/Audio/Debug.hpp> #include <Nazara/Audio/Debug.hpp>
namespace Nz namespace Nz

5
xmake.lua
View File

@@ -1,7 +1,7 @@
local modules = { local modules = {
Audio = { Audio = {
Deps = {"NazaraCore"}, Deps = {"NazaraCore"},
Packages = {"dr_wav", "libogg", "libsndfile", "minimp3"} Packages = {"dr_wav", "libsndfile", "libvorbis", "minimp3"}
}, },
Core = { Core = {
Custom = function () Custom = function ()
@@ -92,7 +92,8 @@ local modules = {
add_repositories("local-repo xmake-repo") add_repositories("local-repo xmake-repo")
add_requires("chipmunk2d", "dr_wav", "freetype", "libogg", "libsndfile", "libsdl", "minimp3", "stb") add_requires("chipmunk2d", "dr_wav", "freetype", "libsndfile", "libsdl", "libvorbis", "minimp3", "stb")
add_requireconfs("libvorbis", { system = false })
add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
set_project("NazaraEngine") set_project("NazaraEngine")