Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion

src/CMakeLists.txt

@@ -14,7 +14,6 @@ add_subdirectory(qhull)
 add_subdirectory(Shiny)
 add_subdirectory(semver)
 add_subdirectory(libigl)
-add_subdirectory(hidapi)
 
 # Adding libnest2d project for bin packing...
 set(LIBNEST2D_UNITTESTS ON CACHE BOOL "Force generating unittests for libnest2d")
@@ -24,6 +23,8 @@ add_subdirectory(libslic3r)
 
 if (SLIC3R_GUI)
     add_subdirectory(imgui)
+    add_subdirectory(hidapi)
+    include_directories(hidapi/include)
 
     if(WIN32)
         message(STATUS "WXWIN environment set to: $ENV{WXWIN}")

src/slic3r/GUI/Mouse3DController.hpp

@@ -4,7 +4,7 @@
 #if ENABLE_3DCONNEXION_DEVICES
 #include "libslic3r/Point.hpp"
 
-#include "hidapi/hidapi.h"
+#include "hidapi.h"
 
 #include <thread>
 #include <mutex>