Skip to content

Commit

Permalink
Use simple include paths (google#571)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jaebaek authored Jul 5, 2019
1 parent f121ebb commit eafddd8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/dxc_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/shader_compiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit eafddd8

Please sign in to comment.