From 1f900d9e67c2a8874871df7857dbc9c74e1cd670 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 00:38:45 +0800 Subject: [PATCH 1/6] update vk-bootstrap to v1.3.275 --- packages/v/vk-bootstrap/xmake.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index f2ef5822290..d4c0ea9ccee 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -9,6 +9,7 @@ package("vk-bootstrap") add_versions("v0.5", "7ec1017d71d48595c078a4488140b230fd9cad1059986a18a507f356bf00e89b") add_versions("v0.6", "95dedaa5cedf7a271f051d91b24b3b6c78aa3c5b2bc3cf058554c92748a421b2") add_versions("v0.7", "7b2c30a4c46514cc5b20d2bebab25c495df39574b9e117c760d1cfe19f71d9aa") + add_versions("v1.3.275", "33737a731e8b3a4539812e63502ea55dffb3dbc7331b44c4cc0902fbf797f5ff") add_deps("vulkan-headers") @@ -24,7 +25,7 @@ package("vk-bootstrap") add_requires("vulkan-headers") target("vk-bootstrap") set_kind("static") - set_languages("cxx14") + ]] .. (package:version():ge("1.3.212") and "set_languages(\"cxx17\")" or "set_languages(\"cxx14\")") .. [[ add_files("src/VkBootstrap.cpp") add_headerfiles("src/VkBootstrap.h") add_headerfiles("src/VkBootstrapDispatch.h") @@ -37,11 +38,17 @@ package("vk-bootstrap") end) on_test(function (package) + local configs = {} + if package:version():ge("1.3.212") then + configs.languages = "cxx17" + else + configs.languages = "cxx14" + end assert(package:check_cxxsnippets({test = [[ vkb::InstanceBuilder builder; auto inst_ret = builder.set_app_name ("Example Vulkan Application") .request_validation_layers () .use_default_debug_messenger () .build (); - ]]}, {configs = {languages = "cxx14"}, includes = "VkBootstrap.h"})) + ]]}, {configs = configs, includes = "VkBootstrap.h"})) end) From 35af22ac53c5058ee87c5f98bc4882a5bf08a8b3 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 00:44:24 +0800 Subject: [PATCH 2/6] add vk-bootstrap v1.3.268 --- packages/v/vk-bootstrap/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index d4c0ea9ccee..5b8a431300a 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -9,6 +9,7 @@ package("vk-bootstrap") add_versions("v0.5", "7ec1017d71d48595c078a4488140b230fd9cad1059986a18a507f356bf00e89b") add_versions("v0.6", "95dedaa5cedf7a271f051d91b24b3b6c78aa3c5b2bc3cf058554c92748a421b2") add_versions("v0.7", "7b2c30a4c46514cc5b20d2bebab25c495df39574b9e117c760d1cfe19f71d9aa") + add_versions("v1.3.268", "028300b0dac2dfaf193ca95d2ecd46a450f6da31095a09334c4c3b76c561714c") add_versions("v1.3.275", "33737a731e8b3a4539812e63502ea55dffb3dbc7331b44c4cc0902fbf797f5ff") add_deps("vulkan-headers") From a09e95281d8bd2723f5a2a8ec8696500cf78abe7 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 00:44:03 +0800 Subject: [PATCH 3/6] update imgui to v1.90.1 --- packages/i/imgui/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 02ab9826d08..2f3102a08a4 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -5,6 +5,8 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz", "https://github.com/ocornut/imgui.git") + add_versions("v1.90.1-docking", "v1.90.1-docking") + add_versions("v1.90.1", "21dcc985bb2ae8fe48047c86135dbc438d6980a8f2e08babbda5be820592f282") add_versions("v1.90-docking", "v1.90-docking") add_versions("v1.90", "170986e6a4b83d165bfc1d33c2c5a5bc2d67e5b97176287485c51a2299249296") add_versions("v1.89.9-docking", "v1.89.9-docking") From 5468a7ae13a126b51710edabf249bc1037c94f78 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 10:07:29 +0800 Subject: [PATCH 4/6] vk-bootstrap handle null from `version()` --- packages/v/vk-bootstrap/xmake.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index 5b8a431300a..65fef0cdef6 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -21,12 +21,24 @@ package("vk-bootstrap") end on_install("windows", "linux", "macosx", function (package) + local version = package:version() + local language_version + + if version == nil then + language_version = "cxx17" + else + if version:ge("1.3.212") then + language_version = "cxx17" + else + language_version = "cxx14" + end + end io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") add_requires("vulkan-headers") target("vk-bootstrap") set_kind("static") - ]] .. (package:version():ge("1.3.212") and "set_languages(\"cxx17\")" or "set_languages(\"cxx14\")") .. [[ + ]] .. language_version .. [[ add_files("src/VkBootstrap.cpp") add_headerfiles("src/VkBootstrap.h") add_headerfiles("src/VkBootstrapDispatch.h") From e5693553407d911a2f6aeb02ecaf6707281358e8 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 10:15:24 +0800 Subject: [PATCH 5/6] vk-bootstrap handle null from `version()` --- packages/v/vk-bootstrap/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index 65fef0cdef6..c6e9d2d2657 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -27,7 +27,7 @@ package("vk-bootstrap") if version == nil then language_version = "cxx17" else - if version:ge("1.3.212") then + if version:ge("1.3.270") then language_version = "cxx17" else language_version = "cxx14" @@ -38,7 +38,7 @@ package("vk-bootstrap") add_requires("vulkan-headers") target("vk-bootstrap") set_kind("static") - ]] .. language_version .. [[ + ]] .. "set_languages(\"" .. language_version .. "\")" .. [[ add_files("src/VkBootstrap.cpp") add_headerfiles("src/VkBootstrap.h") add_headerfiles("src/VkBootstrapDispatch.h") @@ -52,7 +52,7 @@ package("vk-bootstrap") on_test(function (package) local configs = {} - if package:version():ge("1.3.212") then + if package:version():ge("1.3.270") then configs.languages = "cxx17" else configs.languages = "cxx14" From 45dff6fd1fe70e8cf69b9fd8f9f8b21d614f3b8e Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 22 Jan 2024 10:42:03 +0800 Subject: [PATCH 6/6] vk-bootstrap handle null from `version()` --- packages/v/vk-bootstrap/xmake.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index c6e9d2d2657..0d2cfc442a8 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -23,15 +23,10 @@ package("vk-bootstrap") on_install("windows", "linux", "macosx", function (package) local version = package:version() local language_version - - if version == nil then + if not version or version:ge("1.3.270") then language_version = "cxx17" else - if version:ge("1.3.270") then - language_version = "cxx17" - else - language_version = "cxx14" - end + language_version = "cxx14" end io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") @@ -52,7 +47,8 @@ package("vk-bootstrap") on_test(function (package) local configs = {} - if package:version():ge("1.3.270") then + local version = package:version() + if not version or version:ge("1.3.270") then configs.languages = "cxx17" else configs.languages = "cxx14"