GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 06:26:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent NOMINMAX warnings

Browse Source
This commit is contained in:
tamasmeszaros 2023-08-16 11:18:11 +02:00
parent 40c3d8b8a0
commit bd31722bac
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/OpenVDBUtils.cpp
View File

@ -1,4 +1,3 @@
#define NOMINMAX
#include "OpenVDBUtils.hpp" #include "OpenVDBUtils.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER

3
src/libslic3r/SLA/SupportTreeBuilder.cpp
View File

@ -1,9 +1,6 @@
#define NOMINMAX
#include <libslic3r/SLA/SupportTreeBuilder.hpp> #include <libslic3r/SLA/SupportTreeBuilder.hpp>
#include <libslic3r/SLA/SupportTreeUtils.hpp> #include <libslic3r/SLA/SupportTreeUtils.hpp>
#include <libslic3r/SLA/SupportTreeMesher.hpp> #include <libslic3r/SLA/SupportTreeMesher.hpp>
//#include <libslic3r/SLA/Contour3D.hpp>
namespace Slic3r { namespace Slic3r {
namespace sla { namespace sla {

4
src/slic3r/GUI/GUI.cpp
View File

@ -16,7 +16,9 @@
#import <IOKit/pwr_mgt/IOPMLib.h> #import <IOKit/pwr_mgt/IOPMLib.h>
#elif _WIN32 #elif _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOMINMAX #ifndef NOMINMAX
#define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#include "boost/nowide/convert.hpp" #include "boost/nowide/convert.hpp"
#endif #endif

2
src/slic3r/GUI/SysInfoDialog.cpp
View File

@ -23,7 +23,9 @@
#ifdef _WIN32 #ifdef _WIN32
// The standard Windows includes. // The standard Windows includes.
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <Windows.h> #include <Windows.h>
#include <psapi.h> #include <psapi.h>
#endif /* _WIN32 */ #endif /* _WIN32 */