diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-11-14 12:34:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-13 20:34:18 -0800 |
| commit | 7b570feed42976a6e787d79a70aaf8e667745e58 (patch) | |
| tree | 7f96139f9570de1e2c5747faf6ad489e029de535 /tools/platform | |
| parent | fdf106b543c756eebca7e90fe839fdf1902cc381 (diff) | |
Correct include dir for libslang (#5539)
This stops adding the repo root to the include path for anything linking
with slang. This enabled a bunch of convenient includes, but might lead
to confusing behavior for anyone including slang. Not to mention
differences including it from an install vs source.
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/platform')
| -rw-r--r-- | tools/platform/gui.h | 2 | ||||
| -rw-r--r-- | tools/platform/model.cpp | 4 | ||||
| -rw-r--r-- | tools/platform/window.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/platform/gui.h b/tools/platform/gui.h index 82193cb86..eea9aa4f0 100644 --- a/tools/platform/gui.h +++ b/tools/platform/gui.h @@ -1,10 +1,10 @@ // gui.h #pragma once +#include "core/slang-basic.h" #include "external/imgui/imgui.h" #include "slang-com-ptr.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" #include "vector-math.h" #include "window.h" diff --git a/tools/platform/model.cpp b/tools/platform/model.cpp index 8531f7844..18a7ad641 100644 --- a/tools/platform/model.cpp +++ b/tools/platform/model.cpp @@ -7,13 +7,13 @@ #include "../../external/tinyobjloader/tiny_obj_loader.h" #define STB_IMAGE_IMPLEMENTATION -#include "../../external/stb/stb_image.h" +#include "stb_image.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION #include "../../external/glm/glm/glm.hpp" #include "../../external/glm/glm/gtc/constants.hpp" #include "../../external/glm/glm/gtc/matrix_transform.hpp" -#include "../../external/stb/stb_image_resize.h" +#include "stb_image_resize.h" #include <memory> #include <unordered_map> diff --git a/tools/platform/window.h b/tools/platform/window.h index a419f85b9..4ff9e245f 100644 --- a/tools/platform/window.h +++ b/tools/platform/window.h @@ -1,10 +1,10 @@ // window.h #pragma once +#include "core/slang-basic.h" +#include "core/slang-func-ptr.h" #include "platform-api.h" #include "slang-com-ptr.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-func-ptr.h" namespace platform { |