hunspell: project update

git-svn-id: http://svn.miranda-ng.org/main/trunk@16193 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 101 insertions, 82 deletions

diff --git a/libs/hunspell/hunspell.vcxproj b/libs/hunspell/hunspell.vcxproj
index 97e7c44b15..08f1277815 100644
--- a/libs/hunspell/hunspell.vcxproj
+++ b/libs/hunspell/hunspell.vcxproj
@@ -5,109 +5,128 @@
       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <SccProjectName />

-    <SccLocalPath />

-    <ProjectGuid>{DC36CC15-F98C-4CEC-82E0-3E55ABB1B1BD}</ProjectGuid>

+    <ProjectGuid>{b80c2c8d-b987-48b6-afe2-8da2d17f2f6a}</ProjectGuid>

+    <ProjectName>hunspell</ProjectName>

   </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+  <PropertyGroup>

+    <GenerateManifest>false</GenerateManifest>

+    <EmbedManifest>false</EmbedManifest>

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <PlatformToolset>v120</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>Unicode</CharacterSet>

+    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Libs\</OutDir>

+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Libs\</OutDir>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <PlatformToolset>v120</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Label="UserMacros">

+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\bin10\lib</CommonLibDir>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\bin12\lib</CommonLibDir>

+    <CommonLibDir Condition="'$(VisualStudioVersion)' == '14.0'">$(ProjectDir)..\..\bin14\lib</CommonLibDir>

+  </PropertyGroup>

+  <PropertyGroup>

+    <RootNamespace>$(ProjectName)</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

     <CharacterSet>Unicode</CharacterSet>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>

+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>

+    <IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>

+    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>

   </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>.\Release\</OutDir>

-    <IntDir>.\Release\</IntDir>

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+  <ItemDefinitionGroup>

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <FunctionLevelLinking>false</FunctionLevelLinking>

-      <Optimization>Disabled</Optimization>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <WarningLevel>Level3</WarningLevel>

-      <MinimalRebuild>true</MinimalRebuild>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BUILDING_LIBHUNSPELL;W32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Debug\hunspell.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Debug\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\plugins\ExternalAPI;$(ProjectDir)..\..\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>BUILDING_LIBHUNSPELL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <IntrinsicFunctions>false</IntrinsicFunctions>

+      <WarningLevel>Level4</WarningLevel>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>

+      <ExceptionHandling>false</ExceptionHandling>

     </ClCompile>

+    <Link>

+      <AdditionalDependencies>winmm.lib;Wtsapi32.lib;netapi32.lib;pdh.lib;shlwapi.lib;Strmiids.lib;gdiplus.lib;dbghelp.lib;Setupapi.lib;msimg32.lib;comctl32.lib;ws2_32.lib;UxTheme.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>$(CommonLibDir)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <GenerateMapFile>false</GenerateMapFile>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

     <ResourceCompile>

-      <Culture>0x040e</Culture>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\hunspell.bsc</OutputFile>

-    </Bscmake>

-    <Lib>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\hunspell.lib</OutputFile>

-    </Lib>

   </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

     <ClCompile>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

-      <StringPooling>true</StringPooling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <Optimization>MaxSpeed</Optimization>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <WarningLevel>Level3</WarningLevel>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;BUILDING_LIBHUNSPELL;W32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Release\hunspell.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Release\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

+      <Optimization>Disabled</Optimization>

+      <WholeProgramOptimization>false</WholeProgramOptimization>

+      <PreprocessorDefinitions>DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

     </ClCompile>

-    <ResourceCompile>

-      <Culture>0x040e</Culture>

+    <Link>

+      <LinkTimeCodeGeneration>

+      </LinkTimeCodeGeneration>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <OmitFramePointers>true</OmitFramePointers>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <StringPooling>true</StringPooling>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\hunspell.bsc</OutputFile>

-    </Bscmake>

-    <Lib>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\hunspell.lib</OutputFile>

-    </Lib>

+      <MinimalRebuild>false</MinimalRebuild>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+    </ClCompile>

+    <Link>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <AdditionalOptions Condition="'$(VisualStudioVersion)' == '10.0'">/PDBALTPATH:%_PDB%</AdditionalOptions>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">

+    <ClCompile>

+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+    </ClCompile>

+    <Link>

+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

   </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">

+    <ClCompile>

+    </ClCompile>

+    <Link>

+      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\boost\stage64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <PropertyGroup>

+    <TargetExt>.mir</TargetExt>

+    <TargetPath>$(OutDir)$(TargetName)$(TargetExt)</TargetPath>

+  </PropertyGroup>

   <ItemGroup>

     <ClCompile Include="src\affentry.cxx" />

     <ClCompile Include="src\affixmgr.cxx" />