Merge branch 'master' of https://github.com/prusa3d/Slic3r
This commit is contained in:
commit
e0545852f5
@ -189,7 +189,6 @@ target_link_libraries(libslic3r
|
|||||||
clipper
|
clipper
|
||||||
nowide
|
nowide
|
||||||
${EXPAT_LIBRARIES}
|
${EXPAT_LIBRARIES}
|
||||||
${GLEW_LIBRARIES}
|
|
||||||
glu-libtess
|
glu-libtess
|
||||||
polypartition
|
polypartition
|
||||||
poly2tri
|
poly2tri
|
||||||
|
@ -154,7 +154,7 @@ endif ()
|
|||||||
|
|
||||||
add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
|
add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
|
||||||
|
|
||||||
target_link_libraries(libslic3r_gui libslic3r avrdude imgui)
|
target_link_libraries(libslic3r_gui libslic3r avrdude imgui ${GLEW_LIBRARIES})
|
||||||
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
|
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
|
||||||
add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
|
add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
|
||||||
endif ()
|
endif ()
|
||||||
|
Loading…
Reference in New Issue
Block a user