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 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
parent 7374b8a355 53298c1fd1
commit 708d2add51
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-unused-parameter" />
<Add option="-Wno-overloaded-virtual" /> <Add option="-Wno-overloaded-virtual" />
<Add option="-DFL_CPP11" /> <Add option="-DFL_CPP11" />
<Add option="-DFL_WINDOWS" />
<Add directory="$(#boost.include)" /> <Add directory="$(#boost.include)" />
<Add directory="fuzzylite" /> <Add directory="fuzzylite" />
</Compiler> </Compiler>

8
AI/FuzzyLite/FuzzyLite.vcxproj
View File

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

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

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