[Hunter] Fix matdbg

elisemorysc · Sep 7, 2021 · b8b501b · b8b501b
1 parent d80d9d2
commit b8b501b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/libs/matdbg/CMakeLists.txt b/libs/matdbg/CMakeLists.txt
@@ -71,25 +71,23 @@ add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
 
 if(HUNTER_ENABLED)
   target_link_libraries(${TARGET} PUBLIC
-        utils
-        filaflat
-        filabridge
         backend_headers
         civetweb::civetweb-c-library 
         civetweb::civetweb-cpp
-        utils
+        filabridge
+        filaflat
+        filamat
         glslang::SPIRV
+        matdbg_resources
         SPIRV-Tools::SPIRV-Tools
         spirv-cross-glsl
-        matdbg_resources
         spirv-cross-core
         spirv-cross-glsl
+        utils
+        utils
   )
 else()
   target_link_libraries(${TARGET} PUBLIC
-        utils
-        filaflat
-        filabridge
         backend_headers
         civetweb
         filabridge
@@ -109,6 +107,8 @@ if(HUNTER_ENABLED)
   install(TARGETS matdbg_resources EXPORT ${TARGETS_EXPORT_NAME})
 endif()
 
+target_include_directories(${TARGET} PRIVATE ${filamat_SOURCE_DIR}/src)
+
 if(HUNTER_ENABLED)
   target_include_directories(${TARGET} PUBLIC  
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${PUBLIC_HDR_DIR}>  

diff --git a/libs/matdbg/src/ShaderReplacer.cpp b/libs/matdbg/src/ShaderReplacer.cpp
@@ -26,9 +26,14 @@
 
 #include <sstream>
 
+#ifdef FILAMENT_USE_HUNTER
+#include <glslang/SPIRV/GlslangToSpv.h>
+#include <smol-v/smolv.h>
+#else 
 #include <GlslangToSpv.h>
-
 #include <smolv.h>
+#endif
+
 
 #include "sca/builtinResource.h"
 #include "sca/GLSLTools.h"