From 44c4a9eeb3e3ec6f320c26aced5f3f540e68e65a Mon Sep 17 00:00:00 2001 From: Masterkatze Date: Wed, 7 Apr 2021 00:37:20 +0300 Subject: [PATCH 1/2] Fix Linux build issue in dxPixEventWrapper macro --- src/Layers/xrRender/Debug/dxPixEventWrapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layers/xrRender/Debug/dxPixEventWrapper.h b/src/Layers/xrRender/Debug/dxPixEventWrapper.h index 834915e9c7f..267a8789248 100644 --- a/src/Layers/xrRender/Debug/dxPixEventWrapper.h +++ b/src/Layers/xrRender/Debug/dxPixEventWrapper.h @@ -3,7 +3,7 @@ #if defined(MASTER_GOLD) # define PIX_EVENT(Name) do { } while (false) #else -# define PIX_EVENT(Name) dxPixEventWrapper pixEvent##Name(L#Name) +# define PIX_EVENT(Name) dxPixEventWrapper pixEvent##Name(L###Name) class dxPixEventWrapper { From fc57756fd6c742b601c29ca61d7c0d9887967e58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 02:07:45 +0000 Subject: [PATCH 2/2] build(deps): bump Externals/LuaJIT from `c4bba1b` to `695a465` Bumps [Externals/LuaJIT](https://github.com/OpenXRay/LuaJIT) from `c4bba1b` to `695a465`. - [Release notes](https://github.com/OpenXRay/LuaJIT/releases) - [Commits](https://github.com/OpenXRay/LuaJIT/compare/c4bba1b5771116bed899aceb87196d31e2493ff0...695a465c3218026bffa8ab9131fded6cc9a8dd8f) --- updated-dependencies: - dependency-name: Externals/LuaJIT dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Externals/LuaJIT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals/LuaJIT b/Externals/LuaJIT index c4bba1b5771..695a465c321 160000 --- a/Externals/LuaJIT +++ b/Externals/LuaJIT @@ -1 +1 @@ -Subproject commit c4bba1b5771116bed899aceb87196d31e2493ff0 +Subproject commit 695a465c3218026bffa8ab9131fded6cc9a8dd8f