From f291ad189a9ae63e0303039f2aac7b5db3dac8e2 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Fri, 24 May 2024 15:10:58 +0800
Subject: [PATCH] 1.Remove sdl2 from thirdparty since it is already required by
 imgui; 2.Update imgui to v1.90.6; 3.Update spdlog to v 1.14.1

---
 thirdparty/projectx       |  2 +-
 thirdparty/sdl2/xmake.lua | 10 ----------
 thirdparty/xmake.lua      |  2 +-
 xmake.lua                 |  7 +++----
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 thirdparty/sdl2/xmake.lua

diff --git a/thirdparty/projectx b/thirdparty/projectx
index 3fc8f9f..5deb52c 160000
--- a/thirdparty/projectx
+++ b/thirdparty/projectx
@@ -1 +1 @@
-Subproject commit 3fc8f9f616a11432e0e4176f577ec407b90206b4
+Subproject commit 5deb52ce2d5bc6179b46f899db5ebf92e810ed1e
diff --git a/thirdparty/sdl2/xmake.lua b/thirdparty/sdl2/xmake.lua
deleted file mode 100644
index 1378cb7..0000000
--- a/thirdparty/sdl2/xmake.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-package("sdl2")
-    add_urls("https://github.com/libsdl-org/SDL/archive/refs/tags/release-2.28.3.tar.gz", {alias = "github"})
-    add_versions("github:2.28.3", "c17455d6e0c484bfe634b8de6af4c608e86ee449c28e40af04064aa6643fe382")
-
-    on_install(function (package)
-        local configs = {}
-        table.insert(configs, "-DSDL_SHARED_ENABLED_BY_DEFAULT=OFF -DSDL_TEST_ENABLED_BY_DEFAULT=OFF")
-        import("package.tools.cmake").install(package, configs)
-    end)
-package_end()
\ No newline at end of file
diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua
index 69a54da..b95d56a 100644
--- a/thirdparty/xmake.lua
+++ b/thirdparty/xmake.lua
@@ -1,4 +1,4 @@
-includes("sdl2", "projectx")
+includes("projectx")
 if is_plat("windows") then
 elseif is_plat("linux") then
     includes("ffmpeg")
diff --git a/xmake.lua b/xmake.lua
index fefc317..dea9b13 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -13,9 +13,8 @@ if is_mode("debug") then
     add_defines("REMOTE_DESK_DEBUG")
 end
 
-add_requires("sdl2 2.28.3", {system = false})
-add_requires("spdlog 1.11.0", {system = false})
-add_requires("imgui 1.89.9", {configs = {sdl2 = true, sdl2_renderer = true}})
+add_requires("spdlog 1.14.1", {system = false})
+add_requires("imgui 1.90.6", {configs = {sdl2 = true, sdl2_renderer = true}})
 add_requires("libyuv")
 
 if is_os("windows") then
@@ -41,7 +40,7 @@ elseif is_os("macosx") then
     add_frameworks("OpenGL")
 end
 
-add_packages("spdlog", "sdl2", "imgui")
+add_packages("spdlog", "imgui")
 
 includes("thirdparty")