Fix: Building with WITH_OPENVDB=OFF and WITH_LZMA=ON
This caused NOMINMAX not to be defined when `LzmaLib.h` includes `windows.h` which causes a definition of min which upsets `std::min` By moving BLI_winstuff.hh up, it will take care of this define for us in case it was not yet defined regardless of openvdb being on or off Pull Request: https://projects.blender.org/blender/blender/pulls/114816
This commit is contained in:
committed by
Ray molenkamp
parent
f74ed4d45d
commit
7e8557e6c6
@@ -12,6 +12,13 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/* needed for directory lookup */
|
||||
#ifndef WIN32
|
||||
# include <dirent.h>
|
||||
#else
|
||||
# include "BLI_winstuff.h"
|
||||
#endif
|
||||
|
||||
#include "CLG_log.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
@@ -77,13 +84,6 @@
|
||||
# include "LzmaLib.h"
|
||||
#endif
|
||||
|
||||
/* needed for directory lookup */
|
||||
#ifndef WIN32
|
||||
# include <dirent.h>
|
||||
#else
|
||||
# include "BLI_winstuff.h"
|
||||
#endif
|
||||
|
||||
#define PTCACHE_DATA_FROM(data, type, from) \
|
||||
if (data[type]) { \
|
||||
memcpy(data[type], from, ptcache_data_size[type]); \
|
||||
|
||||
Reference in New Issue
Block a user