Skip to content

Commit

Permalink
also get tests to compile with x64
Browse files Browse the repository at this point in the history
  • Loading branch information
steffennissen committed Aug 16, 2014
1 parent ed13ff9 commit 4c55f94
Show file tree
Hide file tree
Showing 36 changed files with 168 additions and 13 deletions.
22 changes: 22 additions & 0 deletions VS2010/fann_tests.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,51 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Debug|Win32.ActiveCfg = Debug|Win32
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Debug|Win32.Build.0 = Debug|Win32
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Debug|x64.ActiveCfg = Debug|x64
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Debug|x64.Build.0 = Debug|x64
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Release|Win32.ActiveCfg = Release|Win32
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Release|Win32.Build.0 = Release|Win32
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Release|x64.ActiveCfg = Release|x64
{2F0EC4B6-B3F8-4A05-A884-B935E82E1390}.Release|x64.Build.0 = Release|x64
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Debug|Win32.ActiveCfg = Debug|Win32
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Debug|Win32.Build.0 = Debug|Win32
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Debug|x64.ActiveCfg = Debug|x64
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Debug|x64.Build.0 = Debug|x64
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Release|Win32.ActiveCfg = Release|Win32
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Release|Win32.Build.0 = Release|Win32
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Release|x64.ActiveCfg = Release|x64
{7FFD0423-9EE1-4CB9-AAF0-6FC5F82535FF}.Release|x64.Build.0 = Release|x64
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Debug|Win32.ActiveCfg = Debug|Win32
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Debug|Win32.Build.0 = Debug|Win32
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Debug|x64.ActiveCfg = Debug|x64
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Debug|x64.Build.0 = Debug|x64
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Release|Win32.ActiveCfg = Release|Win32
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Release|Win32.Build.0 = Release|Win32
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Release|x64.ActiveCfg = Release|x64
{80EE4A35-E029-4E6E-914D-899D409F40DF}.Release|x64.Build.0 = Release|x64
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Debug|Win32.ActiveCfg = Debug|Win32
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Debug|Win32.Build.0 = Debug|Win32
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Debug|x64.ActiveCfg = Debug|x64
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Debug|x64.Build.0 = Debug|x64
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Release|Win32.ActiveCfg = Release|Win32
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Release|Win32.Build.0 = Release|Win32
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Release|x64.ActiveCfg = Release|x64
{BC62B048-BD91-4130-8C61-DBE48515FF13}.Release|x64.Build.0 = Release|x64
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Debug|Win32.ActiveCfg = Debug|Win32
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Debug|Win32.Build.0 = Debug|Win32
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Debug|x64.ActiveCfg = Debug|x64
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Debug|x64.Build.0 = Debug|x64
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Release|Win32.ActiveCfg = Release|Win32
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Release|Win32.Build.0 = Release|Win32
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Release|x64.ActiveCfg = Release|x64
{EA43987C-28F6-4F8E-B22C-3A64534D24CB}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
76 changes: 74 additions & 2 deletions VS2010/gtest/gtest.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
<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>
<ItemGroup>
<ClCompile Include="..\..\lib\gtest-1.6.0\src\gtest-all.cc" />
Expand All @@ -25,32 +33,64 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<TargetName>$(ProjectName)d</TargetName>
<OutDir>$(SolutionDir)..\bin\</OutDir>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetExt>.lib</TargetExt>
<TargetName>$(ProjectName)d</TargetName>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\</OutDir>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<TargetExt>.lib</TargetExt>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<TargetExt>.lib</TargetExt>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -66,6 +106,20 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_USRDLL;FANN_DLL_EXPORTS;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\lib\gtest-1.6.0\include;..\..\lib\gtest-1.6.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -84,6 +138,24 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_USRDLL;FANN_DLL_EXPORTS;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\lib\gtest-1.6.0\include;..\..\lib\gtest-1.6.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
74 changes: 72 additions & 2 deletions VS2010/tests_float/tests_float.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
<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">
<ProjectGuid>{BC62B048-BD91-4130-8C61-DBE48515FF13}</ProjectGuid>
Expand All @@ -21,30 +29,60 @@
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\</OutDir>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<TargetName>$(ProjectName)d</TargetName>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<TargetName>$(ProjectName)d</TargetName>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\</OutDir>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\bin\$(Platform)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -60,6 +98,20 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\src\include;..\..\lib\gtest-1.6.0\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -78,6 +130,24 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\src\include;..\..\lib\gtest-1.6.0\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\fannfloat\fannfloat.vcxproj">
<Project>{2f0ec4b6-b3f8-4a05-a884-b935e82e1390}</Project>
Expand Down
Binary file modified bin/Win32/fanndouble.dll
Binary file not shown.
Binary file modified bin/Win32/fanndouble.lib
Binary file not shown.
Binary file modified bin/Win32/fanndoubled.dll
Binary file not shown.
Binary file modified bin/Win32/fanndoubled.lib
Binary file not shown.
Binary file modified bin/Win32/fannfixed.dll
Binary file not shown.
Binary file modified bin/Win32/fannfixed.lib
Binary file not shown.
Binary file modified bin/Win32/fannfixedd.dll
Binary file not shown.
Binary file modified bin/Win32/fannfixedd.lib
Binary file not shown.
Binary file modified bin/Win32/fannfloat.dll
Binary file not shown.
Binary file modified bin/Win32/fannfloat.lib
Binary file not shown.
Binary file modified bin/Win32/fannfloatd.dll
Binary file not shown.
Binary file modified bin/Win32/fannfloatd.lib
Binary file not shown.
Binary file added bin/Win32/gtest.lib
Binary file not shown.
Binary file added bin/Win32/gtestd.lib
Binary file not shown.
Binary file added bin/Win32/tests_float.exe
Binary file not shown.
Binary file added bin/Win32/tests_floatd.exe
Binary file not shown.
Binary file modified bin/x64/fanndouble.dll
Binary file not shown.
Binary file modified bin/x64/fanndouble.lib
Binary file not shown.
Binary file modified bin/x64/fanndoubled.dll
Binary file not shown.
Binary file modified bin/x64/fanndoubled.lib
Binary file not shown.
Binary file modified bin/x64/fannfixed.dll
Binary file not shown.
Binary file modified bin/x64/fannfixed.lib
Binary file not shown.
Binary file modified bin/x64/fannfixedd.dll
Binary file not shown.
Binary file modified bin/x64/fannfixedd.lib
Binary file not shown.
Binary file modified bin/x64/fannfloat.dll
Binary file not shown.
Binary file modified bin/x64/fannfloat.lib
Binary file not shown.
Binary file modified bin/x64/fannfloatd.dll
Binary file not shown.
Binary file modified bin/x64/fannfloatd.lib
Binary file not shown.
Binary file added bin/x64/gtest.lib
Binary file not shown.
Binary file added bin/x64/gtestd.lib
Binary file not shown.
Binary file added bin/x64/tests_float.exe
Binary file not shown.
Binary file added bin/x64/tests_floatd.exe
Binary file not shown.
9 changes: 0 additions & 9 deletions bin/xor.data

This file was deleted.

0 comments on commit 4c55f94

Please sign in to comment.