GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-08 09:59:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Enrico Turri 2019-09-30 15:38:13 +02:00
commit b11704d380
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

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

2
src/slic3r/GUI/Mouse3DController.hpp
View File

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