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/qhullstatic.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>StaticLibrary</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>StaticLibrary</ConfigurationType>
    … …  
    3658    <CharacterSet>MultiByte</CharacterSet>
    3759  </PropertyGroup>
     60  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" Label="Configuration">
     61    <ConfigurationType>StaticLibrary</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>StaticLibrary</ConfigurationType>
    … …  
    4270    <CharacterSet>MultiByte</CharacterSet>
    4371  </PropertyGroup>
     72  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     73    <ConfigurationType>StaticLibrary</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>StaticLibrary</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>StaticLibrary</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>
    … …  
    71123    <IntDir>qhullstatic.dir\Debug\</IntDir>
    72124  </PropertyGroup>
     125  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    73126  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    74127    <OutDir>Release\</OutDir>
    75128    <IntDir>qhullstatic.dir\Release\</IntDir>
    76129  </PropertyGroup>
     130  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    77131  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    78132    <OutDir>MinSizeRel\</OutDir>
    79133    <IntDir>qhullstatic.dir\MinSizeRel\</IntDir>
    80134  </PropertyGroup>
     135  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" />
    81136  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    82137    <OutDir>RelWithDebInfo\</OutDir>
    83138    <IntDir>qhullstatic.dir\RelWithDebInfo\</IntDir>
    84139  </PropertyGroup>
     140  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" />
    85141  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    86142    <Midl>
    … …  
    120176    </Lib>
    121177  </ItemDefinitionGroup>
     178  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     179    <Midl>
     180      <MkTypLibCompatible>false</MkTypLibCompatible>
     181      <GenerateStublessProxies>true</GenerateStublessProxies>
     182      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     183      <OutputDirectory>$(IntDir)</OutputDirectory>
     184      <HeaderFileName>%(Filename).h</HeaderFileName>
     185      <DllDataFileName>
     186      </DllDataFileName>
     187      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     188      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     189    </Midl>
     190    <ClCompile>
     191      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     192      <Optimization>Disabled</Optimization>
     193      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     194      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     195      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     196      <ExceptionHandling>
     197      </ExceptionHandling>
     198      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     199      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     200      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     201      <AssemblerListingLocation>Debug</AssemblerListingLocation>
     202      <ObjectFileName>$(IntDir)</ObjectFileName>
     203      <ProgramDataBaseFileName>..\lib\qhullstatic_d.pdb</ProgramDataBaseFileName>
     204      <WarningLevel>Level3</WarningLevel>
     205      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     206      <CompileAs>CompileAsC</CompileAs>
     207    </ClCompile>
     208    <ResourceCompile>
     209      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     210      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     211    </ResourceCompile>
     212    <Lib>
     213      <OutputFile>..\lib\qhullstatic_d.lib</OutputFile>
     214    </Lib>
     215  </ItemDefinitionGroup>
    122216  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    123217    <Midl>
    … …  
    155249    </Lib>
    156250  </ItemDefinitionGroup>
     251  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     252    <Midl>
     253      <MkTypLibCompatible>false</MkTypLibCompatible>
     254      <GenerateStublessProxies>true</GenerateStublessProxies>
     255      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     256      <OutputDirectory>$(IntDir)</OutputDirectory>
     257      <HeaderFileName>%(Filename).h</HeaderFileName>
     258      <DllDataFileName>
     259      </DllDataFileName>
     260      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     261      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     262    </Midl>
     263    <ClCompile>
     264      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     265      <Optimization>MaxSpeed</Optimization>
     266      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     267      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     268      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     269      <ExceptionHandling>
     270      </ExceptionHandling>
     271      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     272      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     273      <AssemblerListingLocation>Release</AssemblerListingLocation>
     274      <ObjectFileName>$(IntDir)</ObjectFileName>
     275      <ProgramDataBaseFileName>..\lib\qhullstatic.pdb</ProgramDataBaseFileName>
     276      <WarningLevel>Level3</WarningLevel>
     277      <CompileAs>CompileAsC</CompileAs>
     278    </ClCompile>
     279    <ResourceCompile>
     280      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     281      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     282    </ResourceCompile>
     283    <Lib>
     284      <OutputFile>..\lib\qhullstatic.lib</OutputFile>
     285    </Lib>
     286  </ItemDefinitionGroup>
    157287  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    158288    <Midl>
    … …  
    190320    </Lib>
    191321  </ItemDefinitionGroup>
     322  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     323    <Midl>
     324      <MkTypLibCompatible>false</MkTypLibCompatible>
     325      <GenerateStublessProxies>true</GenerateStublessProxies>
     326      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     327      <OutputDirectory>$(IntDir)</OutputDirectory>
     328      <HeaderFileName>%(Filename).h</HeaderFileName>
     329      <DllDataFileName>
     330      </DllDataFileName>
     331      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     332      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     333    </Midl>
     334    <ClCompile>
     335      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     336      <Optimization>MinSpace</Optimization>
     337      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     338      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     339      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     340      <ExceptionHandling>
     341      </ExceptionHandling>
     342      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     343      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     344      <AssemblerListingLocation>MinSizeRel</AssemblerListingLocation>
     345      <ObjectFileName>$(IntDir)</ObjectFileName>
     346      <ProgramDataBaseFileName>..\lib\qhullstatic.pdb</ProgramDataBaseFileName>
     347      <WarningLevel>Level3</WarningLevel>
     348      <CompileAs>CompileAsC</CompileAs>
     349    </ClCompile>
     350    <ResourceCompile>
     351      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     352      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     353    </ResourceCompile>
     354    <Lib>
     355      <OutputFile>..\lib\qhullstatic.lib</OutputFile>
     356    </Lib>
     357  </ItemDefinitionGroup>
    192358  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    193359    <Midl>
    … …  
    209375      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    210376      <ExceptionHandling />
     377      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     378      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     379      <AssemblerListingLocation>RelWithDebInfo</AssemblerListingLocation>
     380      <ObjectFileName>$(IntDir)</ObjectFileName>
     381      <ProgramDataBaseFileName>..\lib\qhullstatic.pdb</ProgramDataBaseFileName>
     382      <WarningLevel>Level3</WarningLevel>
     383      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     384      <CompileAs>CompileAsC</CompileAs>
     385    </ClCompile>
     386    <ResourceCompile>
     387      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     388      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     389    </ResourceCompile>
     390    <Lib>
     391      <OutputFile>..\lib\qhullstatic.lib</OutputFile>
     392    </Lib>
     393  </ItemDefinitionGroup>
     394  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     395    <Midl>
     396      <MkTypLibCompatible>false</MkTypLibCompatible>
     397      <GenerateStublessProxies>true</GenerateStublessProxies>
     398      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     399      <OutputDirectory>$(IntDir)</OutputDirectory>
     400      <HeaderFileName>%(Filename).h</HeaderFileName>
     401      <DllDataFileName>
     402      </DllDataFileName>
     403      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     404      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     405    </Midl>
     406    <ClCompile>
     407      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     408      <Optimization>MaxSpeed</Optimization>
     409      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     410      <AdditionalIncludeDirectories>..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     411      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     412      <ExceptionHandling>
     413      </ExceptionHandling>
    211414      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    212415      <RuntimeTypeInfo>false</RuntimeTypeInfo>
Note: See TracChangeset for help on using the changeset viewer.