From b16eb592cc31b7cc9ba3d2f9525486c282996a9e Mon Sep 17 00:00:00 2001 From: Lujin Wang <143145775+lujinwangnv@users.noreply.github.com> Date: Fri, 30 May 2025 12:52:55 -0700 Subject: Change SLANG_OVERRIDE_xxx_PATH and fix header file path (#7207) * Fix lua header file path Add two missed files in #7167 * Fix lua header file path Add two missed files in #7167 * Leave lua/ in the path to avoid name conflict * Remove xxx from path of SLANG_OVERRIDE_xxx_PATH Change SLANG_OVERRIDE_xxx_PATH from path-to-parent-folder/xxx to path-to-parent-folder and add "xxx/" back to "#include", which helps to avoid the potential name conflict of external tools. * format code --------- Co-authored-by: Yong He Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/slang-fiddle/slang-fiddle-lua.cpp | 2 +- tools/slang-fiddle/slang-fiddle-script.cpp | 6 +++--- tools/slang-fiddle/slang-fiddle-script.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/slang-fiddle') diff --git a/tools/slang-fiddle/slang-fiddle-lua.cpp b/tools/slang-fiddle/slang-fiddle-lua.cpp index 0d5f04eca..adebf555c 100644 --- a/tools/slang-fiddle/slang-fiddle-lua.cpp +++ b/tools/slang-fiddle/slang-fiddle-lua.cpp @@ -2,4 +2,4 @@ #define MAKE_LIB 1 -#include "onelua.c" +#include "lua/onelua.c" diff --git a/tools/slang-fiddle/slang-fiddle-script.cpp b/tools/slang-fiddle/slang-fiddle-script.cpp index 5add4e16e..0bee052d8 100644 --- a/tools/slang-fiddle/slang-fiddle-script.cpp +++ b/tools/slang-fiddle/slang-fiddle-script.cpp @@ -1,9 +1,9 @@ // slang-fiddle-script.cpp #include "slang-fiddle-script.h" -#include "../external/lua/lapi.h" -#include "../external/lua/lauxlib.h" -#include "../external/lua/lualib.h" +#include "lua/lapi.h" +#include "lua/lauxlib.h" +#include "lua/lualib.h" namespace fiddle { diff --git a/tools/slang-fiddle/slang-fiddle-script.h b/tools/slang-fiddle/slang-fiddle-script.h index d8221a2e8..4b77b32be 100644 --- a/tools/slang-fiddle/slang-fiddle-script.h +++ b/tools/slang-fiddle/slang-fiddle-script.h @@ -1,11 +1,11 @@ // slang-fiddle-script.h #pragma once -#include "../external/lua/lapi.h" -#include "../external/lua/lauxlib.h" #include "compiler-core/slang-source-loc.h" #include "core/slang-list.h" #include "core/slang-string.h" +#include "lua/lapi.h" +#include "lua/lauxlib.h" #include "slang-fiddle-diagnostics.h" #include "slang-fiddle-scrape.h" -- cgit v1.2.3