Skip to content

Commit 2d7d3e3

Browse files
committed
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into submodulesInit
2 parents d090422 + 9a58c8e commit 2d7d3e3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/nbl/builtin/hlsl/cpp_compat/vector.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <glm/glm.hpp>
88
#include <glm/detail/_swizzle.hpp>
99
#include <stdint.h>
10-
#include <openexr/IlmBase/Half/half.h>
10+
#include <half.h>
1111

1212
namespace nbl::hlsl
1313
{

src/nbl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ else()
466466
target_link_libraries(Nabla PRIVATE SPIRV SPIRV-Tools SPIRV-Tools-opt)
467467
endif()
468468
target_include_directories(Nabla PUBLIC
469+
"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/include"
469470
"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Tools/include"
470471
"${THIRD_PARTY_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers/include"
471472
)
@@ -544,7 +545,6 @@ add_custom_target(dxcompiler
544545
add_dependencies(Nabla dxcompiler)
545546
add_dependencies(3rdparty dxcompiler)
546547

547-
target_include_directories(Nabla PRIVATE "${DXC_INCLUDE_DIRECTORIES}")
548548
if(NBL_STATIC_BUILD)
549549
target_link_libraries(Nabla INTERFACE "${DXC_LIB}")
550550
else()

0 commit comments

Comments
 (0)