games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Code Issues Releases Activity

Merge pull request #49 from Mixaill/fuzzylite-fix-3

Browse Source 
Fix compilation on non-MSVC compilators (Global.h not found)
This commit is contained in:
DjWarmonger 2014-11-02 07:40:59 +01:00
commit 708d2add51
3 changed files with 10 additions and 2 deletions
Show Stats 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

@ -271,6 +271,7 @@
</Link>
<ClCompile>
<AdditionalIncludeDirectories>./fuzzylite;.</AdditionalIncludeDirectories>
<PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -281,6 +282,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 />
@ -296,6 +300,7 @@
<AdditionalIncludeDirectories>./fuzzylite;.</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<PreprocessorDefinitions>FL_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">
@ -308,6 +313,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 "?"