Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

AI/FuzzyLite/FuzzyLite.cbp

@@ -73,6 +73,7 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add option="-DFL_CPP11" />
+			<Add option="-DFL_WINDOWS" />
 			<Add directory="$(#boost.include)" />
 			<Add directory="fuzzylite" />
 		</Compiler>

AI/FuzzyLite/FuzzyLite.vcxproj

@@ -270,6 +270,7 @@
     </Link>
     <ClCompile>
       <AdditionalIncludeDirectories>./fuzzylite;.</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -280,6 +281,9 @@
       <AdditionalLibraryDirectories>$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)FuzzyLite.dll</OutputFile>
     </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">
     <ClCompile />
@@ -295,6 +299,7 @@
       <AdditionalIncludeDirectories>./fuzzylite;.</AdditionalIncludeDirectories>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">
@@ -307,6 +312,9 @@
       <AdditionalLibraryDirectories>$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)FuzzyLite.dll</OutputFile>
     </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

AI/FuzzyLite/fuzzylite/fl/fuzzylite.h

@@ -30,8 +30,7 @@
 #include <sstream>
 #include <limits>
 #include <memory>
-#include "../../Global.h"
-#include <iso646.h>
+#include <algorithm>
 
 #ifndef FL_VERSION
 #define FL_VERSION "?"