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/platform/model.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/platform/model.cpp') diff --git a/tools/platform/model.cpp b/tools/platform/model.cpp index a0786d8da..8453363c3 100644 --- a/tools/platform/model.cpp +++ b/tools/platform/model.cpp @@ -4,15 +4,15 @@ #include "window.h" #define TINYOBJLOADER_IMPLEMENTATION -#include "tiny_obj_loader.h" +#include "tinyobjloader/tiny_obj_loader.h" #define STB_IMAGE_IMPLEMENTATION #include "stb_image.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION -#include "glm/glm.hpp" -#include "glm/gtc/constants.hpp" -#include "glm/gtc/matrix_transform.hpp" +#include "glm/glm/glm.hpp" +#include "glm/glm/gtc/constants.hpp" +#include "glm/glm/gtc/matrix_transform.hpp" #include "stb_image_resize.h" #include -- cgit v1.2.3