Added ZipArchive correctly to the CMake Files. Don't know if this was…

… really an issue. See Zip-o-mat#37
AdelinoGP · Feb 23, 2024 · f1eed69 · f1eed69
1 parent 7124bcc
commit f1eed69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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/)
@@ -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
@@ -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!")
@@ -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})
diff --git a/xs/MANIFEST b/xs/MANIFEST
@@ -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