diff --git a/src/Nazara/Audio/Formats/libvorbisLoader.cpp b/src/Nazara/Audio/Formats/libvorbisLoader.cpp index d1540bbe3..ca23c3585 100644 --- a/src/Nazara/Audio/Formats/libvorbisLoader.cpp +++ b/src/Nazara/Audio/Formats/libvorbisLoader.cpp @@ -16,7 +16,10 @@ #include #include #include + +#define OV_EXCLUDE_STATIC_CALLBACKS #include + #include namespace Nz diff --git a/xmake.lua b/xmake.lua index f9b12adfb..a8e24625f 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,7 +1,7 @@ local modules = { Audio = { Deps = {"NazaraCore"}, - Packages = {"dr_wav", "libogg", "libsndfile", "minimp3"} + Packages = {"dr_wav", "libsndfile", "libvorbis", "minimp3"} }, Core = { Custom = function () @@ -92,7 +92,8 @@ local modules = { 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 set_project("NazaraEngine")