diff options
| author | Lujin Wang <143145775+lujinwangnv@users.noreply.github.com> | 2025-05-30 12:52:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-30 19:52:55 +0000 |
| commit | b16eb592cc31b7cc9ba3d2f9525486c282996a9e (patch) | |
| tree | b7916c5dbbb27ffbe330a783ed1dcc0fd9bc4b3b /tools/platform | |
| parent | ec7ab914f79978b8980c7797e20d3399604b1f86 (diff) | |
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 <yonghe@outlook.com>
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'tools/platform')
| -rw-r--r-- | tools/platform/gui.h | 2 | ||||
| -rw-r--r-- | tools/platform/model.cpp | 8 | ||||
| -rw-r--r-- | tools/platform/vector-math.h | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/platform/gui.h b/tools/platform/gui.h index 7e2a12ffe..121fc0894 100644 --- a/tools/platform/gui.h +++ b/tools/platform/gui.h @@ -2,7 +2,7 @@ #pragma once #include "core/slang-basic.h" -#include "imgui.h" +#include "imgui/imgui.h" #include "slang-com-ptr.h" #include "slang-gfx.h" #include "vector-math.h" 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 <memory> diff --git a/tools/platform/vector-math.h b/tools/platform/vector-math.h index de84fe09f..9614f6286 100644 --- a/tools/platform/vector-math.h +++ b/tools/platform/vector-math.h @@ -3,10 +3,10 @@ // We will use the GLM library for our vector math types, just for simplicity. -#include "glm/glm.hpp" -#include "glm/gtc/constants.hpp" -#include "glm/gtc/matrix_transform.hpp" -#include "glm/gtc/quaternion.hpp" +#include "glm/glm/glm.hpp" +#include "glm/glm/gtc/constants.hpp" +#include "glm/glm/gtc/matrix_transform.hpp" +#include "glm/glm/gtc/quaternion.hpp" namespace gfx { |