Skip to content

Commit

Permalink
Added ZipArchive correctly to the CMake Files. Don't know if this was…
Browse files Browse the repository at this point in the history
… really an issue.

See #37
  • Loading branch information
ahlers committed Feb 19, 2021
1 parent fa0ffec commit b198aa0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ include_directories(${LIBDIR}/libslic3r)
include_directories(${LIBDIR}/Slic3r/GUI/)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/standalone/)
include_directories(${LIBDIR}/admesh/)
include_directories(${LIBDIR}/Zip/)
include_directories(${LIBDIR}/BSpline/)
include_directories(${LIBDIR}/expat/)
include_directories(${LIBDIR}/poly2tri/)
Expand Down Expand Up @@ -91,7 +92,10 @@ add_library(libslic3r STATIC
${LIBDIR}/libslic3r/SurfaceCollection.cpp
${LIBDIR}/libslic3r/SVG.cpp
${LIBDIR}/libslic3r/TriangleMesh.cpp
${LIBDIR}/libslic3r/Zip/ZipArchive.cpp
)

add_library(Zip STATIC
${LIBDIR}/Zip/ZipArchive.cpp
)

add_library(BSpline STATIC
Expand Down Expand Up @@ -151,7 +155,7 @@ IF(CMAKE_HOST_UNIX)
#set(Boost_LIBRARIES bsystem bthread bfilesystem)
ENDIF(CMAKE_HOST_UNIX)

target_link_libraries (slic3r libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES})
target_link_libraries (slic3r libslic3r admesh BSpline Zip clipper expat polypartition poly2tri ${Boost_LIBRARIES})

IF(wxWidgets_FOUND)
MESSAGE("wx found!")
Expand All @@ -175,4 +179,4 @@ IF (WIN32)
target_link_libraries(extrude-tin boost-nowide)
ENDIF(WIN32)

target_link_libraries (extrude-tin libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES})
target_link_libraries (extrude-tin libslic3r admesh BSpline Zip clipper expat polypartition poly2tri ${Boost_LIBRARIES})
4 changes: 2 additions & 2 deletions xs/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ src/libslic3r/TriangleMesh.cpp
src/libslic3r/TriangleMesh.hpp
src/libslic3r/utils.cpp
src/libslic3r/utils.hpp
src/libslic3r/Zip/ZipArchive.cpp
src/libslic3r/Zip/ZipArchive.hpp
src/Zip/ZipArchive.cpp
src/Zip/ZipArchive.hpp
src/miniz/miniz.h
src/perlglue.cpp
src/poly2tri/common/shapes.cc
Expand Down

0 comments on commit b198aa0

Please sign in to comment.