mirror of
https://github.com/kunkundi/crossdesk.git
synced 2025-10-26 20:25:34 +08:00
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
This commit is contained in:
2
thirdparty/projectx
vendored
2
thirdparty/projectx
vendored
Submodule thirdparty/projectx updated: 3fc8f9f616...5deb52ce2d
10
thirdparty/sdl2/xmake.lua
vendored
10
thirdparty/sdl2/xmake.lua
vendored
@@ -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()
|
|
||||||
2
thirdparty/xmake.lua
vendored
2
thirdparty/xmake.lua
vendored
@@ -1,4 +1,4 @@
|
|||||||
includes("sdl2", "projectx")
|
includes("projectx")
|
||||||
if is_plat("windows") then
|
if is_plat("windows") then
|
||||||
elseif is_plat("linux") then
|
elseif is_plat("linux") then
|
||||||
includes("ffmpeg")
|
includes("ffmpeg")
|
||||||
|
|||||||
@@ -13,9 +13,8 @@ if is_mode("debug") then
|
|||||||
add_defines("REMOTE_DESK_DEBUG")
|
add_defines("REMOTE_DESK_DEBUG")
|
||||||
end
|
end
|
||||||
|
|
||||||
add_requires("sdl2 2.28.3", {system = false})
|
add_requires("spdlog 1.14.1", {system = false})
|
||||||
add_requires("spdlog 1.11.0", {system = false})
|
add_requires("imgui 1.90.6", {configs = {sdl2 = true, sdl2_renderer = true}})
|
||||||
add_requires("imgui 1.89.9", {configs = {sdl2 = true, sdl2_renderer = true}})
|
|
||||||
add_requires("libyuv")
|
add_requires("libyuv")
|
||||||
|
|
||||||
if is_os("windows") then
|
if is_os("windows") then
|
||||||
@@ -41,7 +40,7 @@ elseif is_os("macosx") then
|
|||||||
add_frameworks("OpenGL")
|
add_frameworks("OpenGL")
|
||||||
end
|
end
|
||||||
|
|
||||||
add_packages("spdlog", "sdl2", "imgui")
|
add_packages("spdlog", "imgui")
|
||||||
|
|
||||||
includes("thirdparty")
|
includes("thirdparty")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user