Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2016-08-21 22:46:17 +0300
committerbubnikv <bubnikv@gmail.com>2016-08-21 22:46:17 +0300
commitab357c75a5746cf21fe7cb531ff849e9843f775c (patch)
treecad9bda942764a533d804b8a0ba403e13722199b /xs/src/libslic3r/PlaceholderParser.cpp
parentbd23fe9c44d4231066f1ceb5dea1b98143a1d95c (diff)
Updated xs/Build.PL to support Visual Studio compiler suite.
Updated xs/Build.PL to understand BOOST_LIBRARY_PATH and BOOST_INCLUDE_PATH environment variables. This way one may easily switch between various boost builds. Some minor tweeks were done to make Slic3r compile with Visual Studio 2013.
Diffstat (limited to 'xs/src/libslic3r/PlaceholderParser.cpp')
-rw-r--r--xs/src/libslic3r/PlaceholderParser.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/xs/src/libslic3r/PlaceholderParser.cpp b/xs/src/libslic3r/PlaceholderParser.cpp
index cddfa21fa..501349d5c 100644
--- a/xs/src/libslic3r/PlaceholderParser.cpp
+++ b/xs/src/libslic3r/PlaceholderParser.cpp
@@ -3,14 +3,22 @@
#include <ctime>
#include <iomanip>
#include <sstream>
-#include <unistd.h> // provides **environ
+#ifdef _MSC_VER
+ #include <stdlib.h> // provides **_environ
+#else
+ #include <unistd.h> // provides **environ
+#endif
#ifdef __APPLE__
#include <crt_externs.h>
#undef environ
#define environ (*_NSGetEnviron())
#else
- extern char **environ;
+ #ifdef _MSC_VER
+ #define environ _environ
+ #else
+ extern char **environ;
+ #endif
#endif
namespace Slic3r {