Remove stb from thirdparty and use xmake instead

src/Nazara/Utility/Formats/STBLoader.cpp

@@ -3,13 +3,14 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/Formats/STBLoader.hpp>
-#include <stb/stb_image.h>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Endianness.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Stream.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <unordered_set>
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace Nz

src/Nazara/Utility/Formats/STBSaver.cpp

@@ -2,11 +2,13 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <stb/stb_image_write.h>
+#include <Nazara/Utility/Formats/STBLoader.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <map>
 #include <stdexcept>
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include <stb_image_write.h>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace Nz

thirdparty/src/stb/stb_image.cpp

@@ -1,2 +0,0 @@
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb/stb_image.h>

thirdparty/src/stb/stb_image_write.cpp

@@ -1,2 +0,0 @@
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include <stb/stb_image_write.h>

thirdparty/xmake.lua

@@ -1,4 +0,0 @@
-target("stb_image")
-	set_kind("static")
-	set_group("Thirdparties")
-	add_files("src/stb/*.cpp")

xmake.lua

@@ -64,8 +64,8 @@ local modules = {
 		Deps = {"NazaraUtility"}
 	},
 	Utility = {
-		Deps = {"stb_image", "NazaraCore"},
+		Deps = {"NazaraCore"},
-		Packages = {"freetype"}
+		Packages = {"freetype", "stb"}
 	},
 	VulkanRenderer = {
 		Deps = {"NazaraRenderer"},
@@ -86,7 +86,7 @@ local modules = {
 
 add_repositories("local-repo xmake-repo")
 
-add_requires("chipmunk2d", "freetype", "libsndfile", "libsdl")
+add_requires("chipmunk2d", "freetype", "libsndfile", "libsdl", "stb")
 add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
 
 set_project("NazaraEngine")
@@ -123,8 +123,6 @@ if is_plat("windows") then
 	add_cxflags("/wd4251") -- Disable warning: class needs to have dll-interface to be used by clients of class blah blah blah
 end
 
-includes("thirdparty/xmake.lua")
-
 for name, module in pairs(modules) do
 	target("Nazara" .. name)