Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/09/13 16:56:03 (11 years ago)
Author:
ascheibe
Message:

#1886

  • added x64 configurations for qhull
  • added a wrapper for qhull volume calculation
  • removed old volume calculation code
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Analysis.AlgorithmBehavior/qhull-2012.1/build/testqset.vcxproj

    r10207 r10208  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="MinSizeRel|Win32">
    913      <Configuration>MinSizeRel</Configuration>
    1014      <Platform>Win32</Platform>
    1115    </ProjectConfiguration>
     16    <ProjectConfiguration Include="MinSizeRel|x64">
     17      <Configuration>MinSizeRel</Configuration>
     18      <Platform>x64</Platform>
     19    </ProjectConfiguration>
    1220    <ProjectConfiguration Include="Release|Win32">
    1321      <Configuration>Release</Configuration>
    1422      <Platform>Win32</Platform>
    1523    </ProjectConfiguration>
     24    <ProjectConfiguration Include="Release|x64">
     25      <Configuration>Release</Configuration>
     26      <Platform>x64</Platform>
     27    </ProjectConfiguration>
    1628    <ProjectConfiguration Include="RelWithDebInfo|Win32">
    1729      <Configuration>RelWithDebInfo</Configuration>
    1830      <Platform>Win32</Platform>
     31    </ProjectConfiguration>
     32    <ProjectConfiguration Include="RelWithDebInfo|x64">
     33      <Configuration>RelWithDebInfo</Configuration>
     34      <Platform>x64</Platform>
    1935    </ProjectConfiguration>
    2036  </ItemGroup>
    … …  
    3046    <CharacterSet>MultiByte</CharacterSet>
    3147  </PropertyGroup>
     48  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
     49    <ConfigurationType>Application</ConfigurationType>
     50    <PlatformToolset>v110</PlatformToolset>
     51    <UseOfMfc>false</UseOfMfc>
     52    <CharacterSet>MultiByte</CharacterSet>
     53  </PropertyGroup>
    3254  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
    3355    <ConfigurationType>Application</ConfigurationType>
    … …  
    3658    <CharacterSet>MultiByte</CharacterSet>
    3759  </PropertyGroup>
     60  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" Label="Configuration">
     61    <ConfigurationType>Application</ConfigurationType>
     62    <PlatformToolset>v110</PlatformToolset>
     63    <UseOfMfc>false</UseOfMfc>
     64    <CharacterSet>MultiByte</CharacterSet>
     65  </PropertyGroup>
    3866  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    3967    <ConfigurationType>Application</ConfigurationType>
    … …  
    4270    <CharacterSet>MultiByte</CharacterSet>
    4371  </PropertyGroup>
     72  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     73    <ConfigurationType>Application</ConfigurationType>
     74    <PlatformToolset>v110</PlatformToolset>
     75    <UseOfMfc>false</UseOfMfc>
     76    <CharacterSet>MultiByte</CharacterSet>
     77  </PropertyGroup>
    4478  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     79    <ConfigurationType>Application</ConfigurationType>
     80    <PlatformToolset>v110</PlatformToolset>
     81    <UseOfMfc>false</UseOfMfc>
     82    <CharacterSet>MultiByte</CharacterSet>
     83  </PropertyGroup>
     84  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4585    <ConfigurationType>Application</ConfigurationType>
    4686    <PlatformToolset>v110</PlatformToolset>
    … …  
    5494    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5595  </ImportGroup>
     96  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="PropertySheets">
     97    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     98  </ImportGroup>
    5699  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="PropertySheets">
    57100    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    58101  </ImportGroup>
     102  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" Label="PropertySheets">
     103    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     104  </ImportGroup>
    59105  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    60106    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    61107  </ImportGroup>
     108  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     109    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     110  </ImportGroup>
    62111  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     112    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     113  </ImportGroup>
     114  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    63115    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    64116  </ImportGroup>
    … …  
    72124    <LinkIncremental>false</LinkIncremental>
    73125  </PropertyGroup>
     126  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     127    <LinkIncremental>false</LinkIncremental>
     128  </PropertyGroup>
    74129  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    75130    <OutDir>Release\</OutDir>
    … …  
    77132    <LinkIncremental>false</LinkIncremental>
    78133  </PropertyGroup>
     134  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     135    <LinkIncremental>false</LinkIncremental>
     136  </PropertyGroup>
    79137  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    80138    <OutDir>MinSizeRel\</OutDir>
    … …  
    82140    <LinkIncremental>false</LinkIncremental>
    83141  </PropertyGroup>
     142  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     143    <LinkIncremental>false</LinkIncremental>
     144  </PropertyGroup>
    84145  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    85146    <OutDir>RelWithDebInfo\</OutDir>
    86147    <IntDir>testqset.dir\RelWithDebInfo\</IntDir>
     148    <LinkIncremental>false</LinkIncremental>
     149  </PropertyGroup>
     150  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
    87151    <LinkIncremental>false</LinkIncremental>
    88152  </PropertyGroup>
    … …  
    133197    </Link>
    134198  </ItemDefinitionGroup>
     199  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     200    <Midl>
     201      <MkTypLibCompatible>false</MkTypLibCompatible>
     202      <GenerateStublessProxies>true</GenerateStublessProxies>
     203      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     204      <OutputDirectory>$(IntDir)</OutputDirectory>
     205      <HeaderFileName>%(Filename).h</HeaderFileName>
     206      <DllDataFileName>
     207      </DllDataFileName>
     208      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     209      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     210    </Midl>
     211    <ClCompile>
     212      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     213      <Optimization>Disabled</Optimization>
     214      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     215      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     216      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     217      <ExceptionHandling>
     218      </ExceptionHandling>
     219      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     220      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     221      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     222      <AssemblerListingLocation>Debug</AssemblerListingLocation>
     223      <ObjectFileName>$(IntDir)</ObjectFileName>
     224      <ProgramDataBaseFileName>..\bin\testqset.pdb</ProgramDataBaseFileName>
     225      <WarningLevel>Level3</WarningLevel>
     226      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     227      <CompileAs>CompileAsC</CompileAs>
     228    </ClCompile>
     229    <ResourceCompile>
     230      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     231      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     232    </ResourceCompile>
     233    <ProjectReference>
     234      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     235    </ProjectReference>
     236    <Link>
     237      <AdditionalOptions> /STACK:10000000 /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
     238      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
     239      <OutputFile>..\bin\testqset.exe</OutputFile>
     240      <Version>6.0</Version>
     241      <GenerateDebugInformation>true</GenerateDebugInformation>
     242      <ProgramDatabaseFile>..\bin\testqset.pdb</ProgramDatabaseFile>
     243      <SubSystem>Console</SubSystem>
     244    </Link>
     245  </ItemDefinitionGroup>
    135246  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    136247    <Midl>
    … …  
    176287    </Link>
    177288  </ItemDefinitionGroup>
     289  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     290    <Midl>
     291      <MkTypLibCompatible>false</MkTypLibCompatible>
     292      <GenerateStublessProxies>true</GenerateStublessProxies>
     293      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     294      <OutputDirectory>$(IntDir)</OutputDirectory>
     295      <HeaderFileName>%(Filename).h</HeaderFileName>
     296      <DllDataFileName>
     297      </DllDataFileName>
     298      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     299      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     300    </Midl>
     301    <ClCompile>
     302      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     303      <Optimization>MaxSpeed</Optimization>
     304      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     305      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     306      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     307      <ExceptionHandling>
     308      </ExceptionHandling>
     309      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     310      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     311      <AssemblerListingLocation>Release</AssemblerListingLocation>
     312      <ObjectFileName>$(IntDir)</ObjectFileName>
     313      <ProgramDataBaseFileName>..\bin\testqset.pdb</ProgramDataBaseFileName>
     314      <WarningLevel>Level3</WarningLevel>
     315      <CompileAs>CompileAsC</CompileAs>
     316    </ClCompile>
     317    <ResourceCompile>
     318      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     319      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     320    </ResourceCompile>
     321    <ProjectReference>
     322      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     323    </ProjectReference>
     324    <Link>
     325      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     326      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
     327      <OutputFile>..\bin\testqset.exe</OutputFile>
     328      <Version>6.0</Version>
     329      <ProgramDatabaseFile>..\bin\testqset.pdb</ProgramDatabaseFile>
     330      <SubSystem>Console</SubSystem>
     331    </Link>
     332  </ItemDefinitionGroup>
    178333  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    179334    <Midl>
    … …  
    219374    </Link>
    220375  </ItemDefinitionGroup>
     376  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     377    <Midl>
     378      <MkTypLibCompatible>false</MkTypLibCompatible>
     379      <GenerateStublessProxies>true</GenerateStublessProxies>
     380      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     381      <OutputDirectory>$(IntDir)</OutputDirectory>
     382      <HeaderFileName>%(Filename).h</HeaderFileName>
     383      <DllDataFileName>
     384      </DllDataFileName>
     385      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     386      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     387    </Midl>
     388    <ClCompile>
     389      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     390      <Optimization>MinSpace</Optimization>
     391      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     392      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     393      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     394      <ExceptionHandling>
     395      </ExceptionHandling>
     396      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     397      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     398      <AssemblerListingLocation>MinSizeRel</AssemblerListingLocation>
     399      <ObjectFileName>$(IntDir)</ObjectFileName>
     400      <ProgramDataBaseFileName>..\bin\testqset.pdb</ProgramDataBaseFileName>
     401      <WarningLevel>Level3</WarningLevel>
     402      <CompileAs>CompileAsC</CompileAs>
     403    </ClCompile>
     404    <ResourceCompile>
     405      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     406      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     407    </ResourceCompile>
     408    <ProjectReference>
     409      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     410    </ProjectReference>
     411    <Link>
     412      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     413      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
     414      <OutputFile>..\bin\testqset.exe</OutputFile>
     415      <Version>6.0</Version>
     416      <ProgramDatabaseFile>..\bin\testqset.pdb</ProgramDatabaseFile>
     417      <SubSystem>Console</SubSystem>
     418    </Link>
     419  </ItemDefinitionGroup>
    221420  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    222421    <Midl>
    … …  
    238437      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    239438      <ExceptionHandling />
     439      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     440      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     441      <AssemblerListingLocation>RelWithDebInfo</AssemblerListingLocation>
     442      <ObjectFileName>$(IntDir)</ObjectFileName>
     443      <ProgramDataBaseFileName>..\bin\testqset.pdb</ProgramDataBaseFileName>
     444      <WarningLevel>Level3</WarningLevel>
     445      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     446      <CompileAs>CompileAsC</CompileAs>
     447    </ClCompile>
     448    <ResourceCompile>
     449      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     450      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     451    </ResourceCompile>
     452    <ProjectReference>
     453      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     454    </ProjectReference>
     455    <Link>
     456      <AdditionalOptions> /STACK:10000000 /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
     457      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib</AdditionalDependencies>
     458      <OutputFile>..\bin\testqset.exe</OutputFile>
     459      <Version>6.0</Version>
     460      <GenerateDebugInformation>true</GenerateDebugInformation>
     461      <ProgramDatabaseFile>..\bin\testqset.pdb</ProgramDatabaseFile>
     462      <SubSystem>Console</SubSystem>
     463    </Link>
     464  </ItemDefinitionGroup>
     465  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     466    <Midl>
     467      <MkTypLibCompatible>false</MkTypLibCompatible>
     468      <GenerateStublessProxies>true</GenerateStublessProxies>
     469      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     470      <OutputDirectory>$(IntDir)</OutputDirectory>
     471      <HeaderFileName>%(Filename).h</HeaderFileName>
     472      <DllDataFileName>
     473      </DllDataFileName>
     474      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     475      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     476    </Midl>
     477    <ClCompile>
     478      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     479      <Optimization>MaxSpeed</Optimization>
     480      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     481      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     482      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     483      <ExceptionHandling>
     484      </ExceptionHandling>
    240485      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    241486      <RuntimeTypeInfo>false</RuntimeTypeInfo>
Note: See TracChangeset for help on using the changeset viewer.