mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-09 14:55:08 -06:00
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
This commit is contained in:
commit
3144cba5f9
283 changed files with 105244 additions and 300 deletions
|
@ -466,7 +466,7 @@ if(APPLE)
|
|||
# Ignore undefined symbols of the perl interpreter, they will be found in the caller image.
|
||||
target_link_libraries(XS "-undefined dynamic_lookup")
|
||||
endif()
|
||||
target_link_libraries(XS libslic3r libslic3r_gui admesh miniz clipper nowide polypartition poly2tri semver avrdude)
|
||||
target_link_libraries(XS libslic3r libslic3r_gui admesh miniz clipper nowide polypartition poly2tri semver avrdude qhull)
|
||||
if(SLIC3R_PROFILE)
|
||||
target_link_libraries(XS Shiny)
|
||||
endif()
|
||||
|
@ -555,6 +555,10 @@ endif()
|
|||
|
||||
add_subdirectory(src/avrdude)
|
||||
|
||||
add_subdirectory(src/qhull)
|
||||
include_directories(${LIBDIR}/qhull/src)
|
||||
message(STATUS ${LIBDIR}/qhull/src)
|
||||
|
||||
## REQUIRED packages
|
||||
|
||||
# Find and configure boost
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue