From 5a6c2baadbc16fc2099a6951e389b9bd3cad08f6 Mon Sep 17 00:00:00 2001 From: lujinwangnv <143145775+lujinwangnv@users.noreply.github.com> Date: Fri, 9 May 2025 18:01:22 -0700 Subject: Update build to allow setting more external paths (#7044) * Update build to allow setting more external paths Update the build to allow setting user-specific paths for the external modules: glm, imgui, slang-rhi, and tinyobjloader. --- tools/platform/gui.h | 2 +- tools/platform/model.cpp | 8 ++++---- tools/platform/vector-math.h | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools/platform') diff --git a/tools/platform/gui.h b/tools/platform/gui.h index eea9aa4f0..7e2a12ffe 100644 --- a/tools/platform/gui.h +++ b/tools/platform/gui.h @@ -2,7 +2,7 @@ #pragma once #include "core/slang-basic.h" -#include "external/imgui/imgui.h" +#include "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 18a7ad641..a0786d8da 100644 --- a/tools/platform/model.cpp +++ b/tools/platform/model.cpp @@ -4,15 +4,15 @@ #include "window.h" #define TINYOBJLOADER_IMPLEMENTATION -#include "../../external/tinyobjloader/tiny_obj_loader.h" +#include "tiny_obj_loader.h" #define STB_IMAGE_IMPLEMENTATION #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 "glm/glm.hpp" +#include "glm/gtc/constants.hpp" +#include "glm/gtc/matrix_transform.hpp" #include "stb_image_resize.h" #include diff --git a/tools/platform/vector-math.h b/tools/platform/vector-math.h index 2e24833eb..de84fe09f 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 "../../external/glm/glm/glm.hpp" -#include "../../external/glm/glm/gtc/constants.hpp" -#include "../../external/glm/glm/gtc/matrix_transform.hpp" -#include "../../external/glm/glm/gtc/quaternion.hpp" +#include "glm/glm.hpp" +#include "glm/gtc/constants.hpp" +#include "glm/gtc/matrix_transform.hpp" +#include "glm/gtc/quaternion.hpp" namespace gfx { -- cgit v1.2.3