diff --git a/BuildTools/windows/GeoDa.vs2019.vcxproj b/BuildTools/windows/GeoDa.vs2019.vcxproj
index ddd2aa7a..2d528a66 100644
--- a/BuildTools/windows/GeoDa.vs2019.vcxproj
+++ b/BuildTools/windows/GeoDa.vs2019.vcxproj
@@ -90,7 +90,7 @@
Disabled
temp\OpenCL\sdk\include;temp\boost;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)
- WIN32;DEBUG;_DEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)
+ WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)
false
EnableFastChecks
MultiThreadedDebugDLL
@@ -103,7 +103,7 @@
true
- __WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
+ NOMINMAX;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
0x0409
temp\wxWidgets\include;%(AdditionalIncludeDirectories)
@@ -122,7 +122,7 @@
Disabled
temp\OpenCL\sdk\include;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\boost\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)
- WIN32;DEBUG;_DEBUG;_WINDOWS;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)
+ WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)
false
EnableFastChecks
MultiThreadedDebugDLL
@@ -139,7 +139,7 @@
Default
- __WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
+ NOMINMAX;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
0x0409
temp\wxWidgets\include;%(AdditionalIncludeDirectories)
@@ -160,7 +160,7 @@
temp\OpenCL\sdk\include;temp\wxWidgets\lib\vc_dll\mswu;temp\wxWidgets\include;temp\boost\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;__WXMSW__;__NO_VC_CRTDBG__;WXUSINGDLL;_UNICODE;__PROJ6__;BOOST_BIND_NO_PLACEHOLDERS;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;NOMINMAX;__WXMSW__;__NO_VC_CRTDBG__;WXUSINGDLL;_UNICODE;__PROJ6__;BOOST_BIND_NO_PLACEHOLDERS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -170,7 +170,7 @@
/MP %(AdditionalOptions)
- __WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
+ NOMINMAX;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;%(PreprocessorDefinitions)
0x0409
temp\wxWidgets\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
temp\OpenCL\sdk\include;temp\wxWidgets\lib\vc_x64_dll\mswu;temp\wxWidgets\include;temp\boost\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)
- WIN32;_WINDOWS;__WXMSW__;__NO_VC_CRTDBG__;WXUSINGDLL;_UNICODE;__PROJ6__;BOOST_BIND_NO_PLACEHOLDERS;%(PreprocessorDefinitions)
+ WIN32;_WINDOWS;NOMINMAX;__WXMSW__;__NO_VC_CRTDBG__;WXUSINGDLL;_UNICODE;__PROJ6__;BOOST_BIND_NO_PLACEHOLDERS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -198,7 +198,7 @@
true
- __WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;UNICODE;%(PreprocessorDefinitions)
+ NOMINMAX;__WXMSW__;_UNICODE;_WINDOWS;NOPCH;WXUSINGDLL;UNICODE;%(PreprocessorDefinitions)
0x0409
temp\wxWidgets\include;%(AdditionalIncludeDirectories)
diff --git a/Explore/Basemap.cpp b/Explore/Basemap.cpp
index fa4aca32..969b5da6 100644
--- a/Explore/Basemap.cpp
+++ b/Explore/Basemap.cpp
@@ -51,10 +51,6 @@
#include "../ShapeOperations/OGRDataAdapter.h"
#include "Basemap.h"
-#ifdef _WIN32
-#define NOMINMAX
-#endif // _WIN32
-
using namespace Gda;
BasemapItem Gda::GetBasemapSelection(int idx, wxString basemap_sources) {