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/qhullcpp.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>qhullcpp.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>qhullcpp.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>qhullcpp.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>qhullcpp.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\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     195      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     196      <ExceptionHandling>Sync</ExceptionHandling>
     197      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     198      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     199      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     200      <AssemblerListingLocation>Debug</AssemblerListingLocation>
     201      <ObjectFileName>$(IntDir)</ObjectFileName>
     202      <ProgramDataBaseFileName>..\lib\qhullcpp_d.pdb</ProgramDataBaseFileName>
     203      <WarningLevel>Level3</WarningLevel>
     204      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     205      <CompileAs>CompileAsCpp</CompileAs>
     206    </ClCompile>
     207    <ResourceCompile>
     208      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     209      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     210    </ResourceCompile>
     211    <Lib>
     212      <OutputFile>..\lib\qhullcpp_d.lib</OutputFile>
     213    </Lib>
     214  </ItemDefinitionGroup>
    122215  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    123216    <Midl>
    … …  
    155248    </Lib>
    156249  </ItemDefinitionGroup>
     250  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     251    <Midl>
     252      <MkTypLibCompatible>false</MkTypLibCompatible>
     253      <GenerateStublessProxies>true</GenerateStublessProxies>
     254      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     255      <OutputDirectory>$(IntDir)</OutputDirectory>
     256      <HeaderFileName>%(Filename).h</HeaderFileName>
     257      <DllDataFileName>
     258      </DllDataFileName>
     259      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     260      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     261    </Midl>
     262    <ClCompile>
     263      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     264      <Optimization>MaxSpeed</Optimization>
     265      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     266      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     267      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     268      <ExceptionHandling>Sync</ExceptionHandling>
     269      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     270      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     271      <AssemblerListingLocation>Release</AssemblerListingLocation>
     272      <ObjectFileName>$(IntDir)</ObjectFileName>
     273      <ProgramDataBaseFileName>..\lib\qhullcpp.pdb</ProgramDataBaseFileName>
     274      <WarningLevel>Level3</WarningLevel>
     275      <CompileAs>CompileAsCpp</CompileAs>
     276    </ClCompile>
     277    <ResourceCompile>
     278      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     279      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     280    </ResourceCompile>
     281    <Lib>
     282      <OutputFile>..\lib\qhullcpp.lib</OutputFile>
     283    </Lib>
     284  </ItemDefinitionGroup>
    157285  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    158286    <Midl>
    … …  
    190318    </Lib>
    191319  </ItemDefinitionGroup>
     320  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     321    <Midl>
     322      <MkTypLibCompatible>false</MkTypLibCompatible>
     323      <GenerateStublessProxies>true</GenerateStublessProxies>
     324      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     325      <OutputDirectory>$(IntDir)</OutputDirectory>
     326      <HeaderFileName>%(Filename).h</HeaderFileName>
     327      <DllDataFileName>
     328      </DllDataFileName>
     329      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     330      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     331    </Midl>
     332    <ClCompile>
     333      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     334      <Optimization>MinSpace</Optimization>
     335      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     336      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     337      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     338      <ExceptionHandling>Sync</ExceptionHandling>
     339      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     340      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     341      <AssemblerListingLocation>MinSizeRel</AssemblerListingLocation>
     342      <ObjectFileName>$(IntDir)</ObjectFileName>
     343      <ProgramDataBaseFileName>..\lib\qhullcpp.pdb</ProgramDataBaseFileName>
     344      <WarningLevel>Level3</WarningLevel>
     345      <CompileAs>CompileAsCpp</CompileAs>
     346    </ClCompile>
     347    <ResourceCompile>
     348      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     349      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     350    </ResourceCompile>
     351    <Lib>
     352      <OutputFile>..\lib\qhullcpp.lib</OutputFile>
     353    </Lib>
     354  </ItemDefinitionGroup>
    192355  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    193356    <Midl>
    … …  
    199362      <HeaderFileName>%(Filename).h</HeaderFileName>
    200363      <DllDataFileName />
     364      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     365      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     366    </Midl>
     367    <ClCompile>
     368      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     369      <Optimization>MaxSpeed</Optimization>
     370      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     371      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     372      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     373      <ExceptionHandling>Sync</ExceptionHandling>
     374      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     375      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     376      <AssemblerListingLocation>RelWithDebInfo</AssemblerListingLocation>
     377      <ObjectFileName>$(IntDir)</ObjectFileName>
     378      <ProgramDataBaseFileName>..\lib\qhullcpp.pdb</ProgramDataBaseFileName>
     379      <WarningLevel>Level3</WarningLevel>
     380      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     381      <CompileAs>CompileAsCpp</CompileAs>
     382    </ClCompile>
     383    <ResourceCompile>
     384      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     385      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     386    </ResourceCompile>
     387    <Lib>
     388      <OutputFile>..\lib\qhullcpp.lib</OutputFile>
     389    </Lib>
     390  </ItemDefinitionGroup>
     391  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     392    <Midl>
     393      <MkTypLibCompatible>false</MkTypLibCompatible>
     394      <GenerateStublessProxies>true</GenerateStublessProxies>
     395      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     396      <OutputDirectory>$(IntDir)</OutputDirectory>
     397      <HeaderFileName>%(Filename).h</HeaderFileName>
     398      <DllDataFileName>
     399      </DllDataFileName>
    201400      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
    202401      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
Note: See TracChangeset for help on using the changeset viewer.