diff options
| author | Jaebaek Seo <jaebaek@google.com> | 2019-07-05 11:43:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 11:43:51 -0400 |
| commit | eafddd8f801dd65cc88c08ac499ea2112426f7c4 (patch) | |
| tree | 700442840783369c78f886029a0731f51c1697ed | |
| parent | f121ebb4f0d68da2ea612dfd0e8ef46a4fd93f7a (diff) | |
| download | amber-eafddd8f801dd65cc88c08ac499ea2112426f7c4.tar.gz | |
Use simple include paths (#571)
This change allows DXC to be picked up from any location, which may
not be in third_party/dxc/include/. A different build system or
environment may place it in a different directory. If amber is part
of another project that already has a copy of DXC, we would not
want two of them.
| -rw-r--r-- | src/dxc_helper.cc | 12 | ||||
| -rw-r--r-- | src/shader_compiler.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/dxc_helper.cc b/src/dxc_helper.cc index 3f141c5..d323b4d 100644 --- a/src/dxc_helper.cc +++ b/src/dxc_helper.cc @@ -27,12 +27,12 @@ // clang-format off // The order here matters, so don't reformat. -#include "third_party/dxc/include/dxc/Support/WinAdapter.h" -#include "third_party/dxc/include/dxc/Support/WinIncludes.h" -#include "third_party/dxc/include/dxc/Support/Global.h" -#include "third_party/dxc/include/dxc/Support/HLSLOptions.h" -#include "third_party/dxc/include/dxc/Support/dxcapi.use.h" -#include "third_party/dxc/include/dxc/dxcapi.h" +#include "dxc/Support/WinAdapter.h" +#include "dxc/Support/WinIncludes.h" +#include "dxc/Support/Global.h" +#include "dxc/Support/HLSLOptions.h" +#include "dxc/Support/dxcapi.use.h" +#include "dxc/dxcapi.h" // clang-format on #if AMBER_PLATFORM_WINDOWS diff --git a/src/shader_compiler.cc b/src/shader_compiler.cc index ad1fd32..674da4a 100644 --- a/src/shader_compiler.cc +++ b/src/shader_compiler.cc @@ -30,7 +30,7 @@ #pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wshadow-uncaptured-local" #pragma clang diagnostic ignored "-Wweak-vtables" -#include "third_party/shaderc/libshaderc/include/shaderc/shaderc.hpp" +#include "shaderc/shaderc.hpp" #pragma clang diagnostic pop #endif // AMBER_ENABLE_SHADERC |