Selaa lähdekoodia

Update tracy to 0.12.0 (#7259)

* Update tracy to 0.12.0

* Update xmake.lua

* Prepend `tracy` folder.

* Check existing workaround for MinGW & MSVC 2019

---------

Co-authored-by: Saikari <[email protected]>
gav2xlin 2 kuukautta sitten
vanhempi
commit
b5d5913605
1 muutettua tiedostoa jossa 10 lisäystä ja 1 poistoa
  1. 10 1
      packages/t/tracy/xmake.lua

+ 10 - 1
packages/t/tracy/xmake.lua

@@ -5,6 +5,7 @@ package("tracy")
     add_urls("https://github.com/wolfpld/tracy/archive/refs/tags/$(version).tar.gz",
              "https://github.com/wolfpld/tracy.git")
 
+    add_versions("v0.12.0", "ce2fb5b89aeb6db8401d7efe1bfe8393b7a81ca551273e8c6dd46ed37c02a040")
     add_versions("v0.11.1", "2c11ca816f2b756be2730f86b0092920419f3dabc7a7173829ffd897d91888a1")
     add_versions("v0.11.0", "b591ef2820c5575ccbf17e2e7a1dc1f6b9a2708f65bfd00f4ebefad2a1ccf830")
     add_versions("v0.10", "a76017d928f3f2727540fb950edd3b736caa97b12dbb4e5edce66542cbea6600")
@@ -12,7 +13,7 @@ package("tracy")
     add_versions("v0.9", "93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc")
     add_versions("v0.8.2", "4784eddd89c17a5fa030d408392992b3da3c503c872800e9d3746d985cfcc92a")
 
-    add_configs("cmake",                            {description = "Use cmake buildsystem", default = false, type = "boolean"})
+    add_configs("cmake",                            {description = "Use cmake buildsystem", default = true, type = "boolean"})
 
     add_configs("tracy_enable",                     {type = "boolean", default = true,  description = "Enable profiling"})
     add_configs("on_demand",                        {type = "boolean", default = false, description = "On-demand profiling"})
@@ -41,6 +42,8 @@ package("tracy")
     add_configs("crash_handler",                    {type = "boolean", default = false, description = "Enable crash handling"})
     add_configs("verb",                             {type = "boolean", default = false, description = "Enable verbose logging"})
 
+    add_includedirs("include", "include/tracy")
+
     if is_plat("windows", "mingw") then
         add_syslinks("ws2_32", "dbghelp")
     elseif is_plat("linux") then
@@ -56,6 +59,12 @@ package("tracy")
     end)
 
     on_install(function (package)
+        io.replace("public/client/TracyProfiler.cpp", [[#ifdef TRACY_ENABLE]], [[#ifdef TRACY_ENABLE
+#ifdef __MINGW32__
+#define __try try
+#define __except(filter) catch(...)
+#endif]], {plain = true})
+        io.replace("public/client/TracyProfiler.cpp", [[RelationProcessorDie]], [[static_cast<LOGICAL_PROCESSOR_RELATIONSHIP>(5)]], {plain = true})
         if package:config("cmake") then
             local configs = {}
             table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))