Merge remote-tracking branch 'origin/master' into ys_ph_printers

xs/CMakeLists.txt

@@ -185,6 +185,16 @@ if (MSVC)
     string(REPLACE "/" "\\" PROPS_CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}")
     configure_file("../cmake/msvc/xs.wperl.props.in" "${CMAKE_BINARY_DIR}/xs.wperl.props" NEWLINE_STYLE CRLF)
     set_target_properties(XS PROPERTIES VS_USER_PROPS "${CMAKE_BINARY_DIR}/xs.wperl.props")
+
+    if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+        set(_bits 64)
+    elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+        set(_bits 32)
+    endif ()
+    add_custom_command(TARGET XS POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy ${TOP_LEVEL_PROJECT_DIR}/deps/GMP/gmp/lib/win${_bits}/libgmp-10.dll "${PERL_LOCAL_LIB_ARCH_DIR}/auto/Slic3r/XS/"
+        COMMENT "Installing gmp runtime into the local-lib directory ..."
+        VERBATIM)
 endif()
 
 # Installation

xs/main.xs.in

@@ -5,7 +5,7 @@
 // #include <libslic3r/GCodeSender.hpp>
 
 #ifdef __cplusplus
-extern "C" {
+/* extern "C" { */
 #endif
 #include "EXTERN.h"
 #include "perl.h"
@@ -14,7 +14,7 @@ extern "C" {
 #undef do_open
 #undef do_close
 #ifdef __cplusplus
-}
+/* } */
 #endif
 
 #ifdef _WIN32

xs/src/xsinit.h

@@ -40,7 +40,7 @@
 // #include <libslic3r.h>
 
 #ifdef SLIC3RXS
-extern "C" {
+// extern "C" {
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -88,7 +88,7 @@ extern "C" {
 #undef Zero
 #undef Packet
 #undef _
-}
+// }
 #endif
 
 #include <ClipperUtils.hpp>

xs/xsp/Geometry.xsp

@@ -13,7 +13,7 @@ Pointfs arrange(size_t total_parts, Vec2d* part, coordf_t dist, BoundingBoxf* bb
     %code{% 
         Pointfs points;
         if (! Slic3r::Geometry::arrange(total_parts, *part, dist, bb, points))
-            CONFESS(PRINTF_ZU " parts won't fit in your print area!\n", total_parts);
+            CONFESS("%zu parts won't fit in your print area!\n", total_parts);
         RETVAL = points;
     %};