games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
DjWarmonger
2014-11-02 08:21:15 +01:00
parent e2a6008aa4 708d2add51
commit dc9082d88c
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AI/FuzzyLite/FuzzyLite.cbp
View File

@@ -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>

8
AI/FuzzyLite/FuzzyLite.vcxproj
View File

@@ -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">

3
AI/FuzzyLite/fuzzylite/fl/fuzzylite.h
View File

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