From 312a6d3ba8137e476ef73393596dea654c30ed6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Sun, 30 May 2021 03:23:40 +0200
Subject: [PATCH] Fix libvorbisfile dependency

---
 src/Nazara/Audio/Formats/libvorbisLoader.cpp | 3 +++
 xmake.lua                                    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 <Nazara/Core/Stream.hpp>
 #include <optional>
 #include <set>
+
+#define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
+
 #include <Nazara/Audio/Debug.hpp>
 
 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")