Browse code

Revert d76a1fe3601ffdcf4b8a30a535a1e2a442f894e2 and change preprocessor check instead

Steffen Neumann authored on 27/11/2021 17:52:21
Showing2 changed files

... ...
@@ -103,7 +103,7 @@ ARCH_OBJS=./boost/libs/filesystem/src/path_traits.o \
103 103
 ./boost/libs/thread/src/win32/tss_dll.o \
104 104
 ./boost/libs/thread/src/win32/thread.o \
105 105
 ./boost_aux/boost/nowide/iostream.o
106
-ARCH_CPPFLAGS=-fpermissive -DWINDOWS_NATIVE -DWIN32 -D_MSC_VER -DBOOST_HAS_WINTHREADS -DBOOST_THREAD_BUILD_LIB
106
+ARCH_CPPFLAGS=-fpermissive -DWINDOWS_NATIVE -DWIN32 -DBOOST_HAS_WINTHREADS -DBOOST_THREAD_BUILD_LIB
107 107
 ARCH_LIBS=-lws2_32 -lz
108 108
 RHDF5_LIBS=$(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'| "${R_HOME}/bin/R" --vanilla --slave)  
109 109
 else
... ...
@@ -25,7 +25,7 @@
25 25
 
26 26
 #include "Filesystem.hpp"
27 27
 
28
-#ifdef _MSC_VER
28
+#ifdef WIN32
29 29
     #define _WIN32_WINNT 0x0600
30 30
     #define WIN32_LEAN_AND_MEAN
31 31
     #define NOMINMAX