3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified dependencies.

Browse Source
This commit is contained in:
bubnikv 2018-09-21 21:16:09 +02:00
parent 49c3d59897
commit bb386bb148
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -53,6 +53,8 @@ endif()
add_subdirectory(slic3r) add_subdirectory(slic3r)
# Create a slic3r executable # Create a slic3r executable
#FIXME add Windows resource file
#add_executable(slic3r slic3r.cpp slic3r.rc)
add_executable(slic3r slic3r.cpp) add_executable(slic3r slic3r.cpp)
if(SLIC3R_GUI) if(SLIC3R_GUI)
set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r-gui") set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r-gui")
@ -71,7 +73,7 @@ endif ()
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries. # Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
if (SLIC3R_GUI) if (SLIC3R_GUI)
target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES}) target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES})
# Configure libcurl & OpenSSL # Configure libcurl & OpenSSL
find_package(CURL REQUIRED) find_package(CURL REQUIRED)

1
src/libslic3r/CMakeLists.txt
View File

@ -165,7 +165,6 @@ target_link_libraries(libslic3r
qhull qhull
semver semver
${TBB_LIBRARIES} ${TBB_LIBRARIES}
# ${wxWidgets_LIBRARIES}
) )
if(SLIC3R_PROFILE) if(SLIC3R_PROFILE)

2
src/libslic3r/Layer.cpp
View File

@ -154,7 +154,7 @@ void Layer::make_fills()
layerm->fills.clear(); layerm->fills.clear();
make_fill(*layerm, layerm->fills); make_fill(*layerm, layerm->fills);
#ifndef NDEBUG #ifndef NDEBUG
for (size_t i = 0; i < layerm.fills.entities.size(); ++ i) for (size_t i = 0; i < layerm->fills.entities.size(); ++ i)
assert(dynamic_cast<ExtrusionEntityCollection*>(layerm->fills.entities[i]) != NULL); assert(dynamic_cast<ExtrusionEntityCollection*>(layerm->fills.entities[i]) != NULL);
#endif #endif
} }

10
xs/CMakeLists.txt
View File

@ -117,23 +117,15 @@ if(APPLE)
# Ignore undefined symbols of the perl interpreter, they will be found in the caller image. # Ignore undefined symbols of the perl interpreter, they will be found in the caller image.
target_link_libraries(XS "-undefined dynamic_lookup") target_link_libraries(XS "-undefined dynamic_lookup")
endif() endif()
target_link_libraries(XS libslic3r admesh miniz clipper nowide polypartition poly2tri semver avrdude qhull) target_link_libraries(XS libslic3r)
if(SLIC3R_PROFILE)
target_link_libraries(XS Shiny)
endif()
target_include_directories(XS PRIVATE src) target_include_directories(XS PRIVATE src)
target_compile_definitions(XS PRIVATE -DSLIC3RXS) target_compile_definitions(XS PRIVATE -DSLIC3RXS)
set_target_properties(XS PROPERTIES PREFIX "") # Prevent cmake from generating libXS.so instead of XS.so set_target_properties(XS PROPERTIES PREFIX "") # Prevent cmake from generating libXS.so instead of XS.so
target_link_libraries(XS ${Boost_LIBRARIES}) target_link_libraries(XS ${Boost_LIBRARIES})
# target_link_libraries(XS ${wxWidgets_LIBRARIES})
# target_link_libraries(XS ${CURL_LIBRARIES})
# target_link_libraries(XS ${OPENSSL_LIBRARIES})
if (APPLE) if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
# -liconv: boost links to libiconv by default # -liconv: boost links to libiconv by default
target_link_libraries(XS "-liconv -framework IOKit" "-framework CoreFoundation" -lc++) target_link_libraries(XS "-liconv -framework IOKit" "-framework CoreFoundation" -lc++)
elseif (MSVC) elseif (MSVC)