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/qconvex.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>qconvex.dir\RelWithDebInfo\</IntDir>
     148    <LinkIncremental>false</LinkIncremental>
     149  </PropertyGroup>
     150  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
    87151    <LinkIncremental>false</LinkIncremental>
    88152  </PropertyGroup>
    … …  
    134198    </Link>
    135199  </ItemDefinitionGroup>
     200  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     201    <Midl>
     202      <MkTypLibCompatible>false</MkTypLibCompatible>
     203      <GenerateStublessProxies>true</GenerateStublessProxies>
     204      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     205      <OutputDirectory>$(IntDir)</OutputDirectory>
     206      <HeaderFileName>%(Filename).h</HeaderFileName>
     207      <DllDataFileName>
     208      </DllDataFileName>
     209      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     210      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     211    </Midl>
     212    <ClCompile>
     213      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     214      <Optimization>Disabled</Optimization>
     215      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     216      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     217      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     218      <ExceptionHandling>
     219      </ExceptionHandling>
     220      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     221      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     222      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     223      <AssemblerListingLocation>Debug</AssemblerListingLocation>
     224      <ObjectFileName>$(IntDir)</ObjectFileName>
     225      <ProgramDataBaseFileName>..\bin\qconvex.pdb</ProgramDataBaseFileName>
     226      <WarningLevel>Level3</WarningLevel>
     227      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     228      <CompileAs>CompileAsC</CompileAs>
     229    </ClCompile>
     230    <ResourceCompile>
     231      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     232      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     233    </ResourceCompile>
     234    <ProjectReference>
     235      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     236    </ProjectReference>
     237    <Link>
     238      <AdditionalOptions> /STACK:10000000 /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
     239      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullstatic_d.lib</AdditionalDependencies>
     240      <OutputFile>..\bin\qconvex.exe</OutputFile>
     241      <Version>6.0</Version>
     242      <GenerateDebugInformation>true</GenerateDebugInformation>
     243      <ProgramDatabaseFile>..\bin\qconvex.pdb</ProgramDatabaseFile>
     244      <SubSystem>Console</SubSystem>
     245      <ImportLibrary>..\lib\qconvex.lib</ImportLibrary>
     246    </Link>
     247  </ItemDefinitionGroup>
    136248  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    137249    <Midl>
    … …  
    178290    </Link>
    179291  </ItemDefinitionGroup>
     292  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     293    <Midl>
     294      <MkTypLibCompatible>false</MkTypLibCompatible>
     295      <GenerateStublessProxies>true</GenerateStublessProxies>
     296      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     297      <OutputDirectory>$(IntDir)</OutputDirectory>
     298      <HeaderFileName>%(Filename).h</HeaderFileName>
     299      <DllDataFileName>
     300      </DllDataFileName>
     301      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     302      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     303    </Midl>
     304    <ClCompile>
     305      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     306      <Optimization>MaxSpeed</Optimization>
     307      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     308      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     309      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     310      <ExceptionHandling>
     311      </ExceptionHandling>
     312      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     313      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     314      <AssemblerListingLocation>Release</AssemblerListingLocation>
     315      <ObjectFileName>$(IntDir)</ObjectFileName>
     316      <ProgramDataBaseFileName>..\bin\qconvex.pdb</ProgramDataBaseFileName>
     317      <WarningLevel>Level3</WarningLevel>
     318      <CompileAs>CompileAsC</CompileAs>
     319    </ClCompile>
     320    <ResourceCompile>
     321      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     322      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     323    </ResourceCompile>
     324    <ProjectReference>
     325      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     326    </ProjectReference>
     327    <Link>
     328      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     329      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullstatic.lib</AdditionalDependencies>
     330      <OutputFile>..\bin\qconvex.exe</OutputFile>
     331      <Version>6.0</Version>
     332      <ProgramDatabaseFile>..\bin\qconvex.pdb</ProgramDatabaseFile>
     333      <SubSystem>Console</SubSystem>
     334      <ImportLibrary>..\lib\qconvex.lib</ImportLibrary>
     335    </Link>
     336  </ItemDefinitionGroup>
    180337  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    181338    <Midl>
    … …  
    222379    </Link>
    223380  </ItemDefinitionGroup>
     381  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     382    <Midl>
     383      <MkTypLibCompatible>false</MkTypLibCompatible>
     384      <GenerateStublessProxies>true</GenerateStublessProxies>
     385      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     386      <OutputDirectory>$(IntDir)</OutputDirectory>
     387      <HeaderFileName>%(Filename).h</HeaderFileName>
     388      <DllDataFileName>
     389      </DllDataFileName>
     390      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     391      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     392    </Midl>
     393    <ClCompile>
     394      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     395      <Optimization>MinSpace</Optimization>
     396      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     397      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     398      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     399      <ExceptionHandling>
     400      </ExceptionHandling>
     401      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     402      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     403      <AssemblerListingLocation>MinSizeRel</AssemblerListingLocation>
     404      <ObjectFileName>$(IntDir)</ObjectFileName>
     405      <ProgramDataBaseFileName>..\bin\qconvex.pdb</ProgramDataBaseFileName>
     406      <WarningLevel>Level3</WarningLevel>
     407      <CompileAs>CompileAsC</CompileAs>
     408    </ClCompile>
     409    <ResourceCompile>
     410      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     411      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     412    </ResourceCompile>
     413    <ProjectReference>
     414      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     415    </ProjectReference>
     416    <Link>
     417      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     418      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullstatic.lib</AdditionalDependencies>
     419      <OutputFile>..\bin\qconvex.exe</OutputFile>
     420      <Version>6.0</Version>
     421      <ProgramDatabaseFile>..\bin\qconvex.pdb</ProgramDatabaseFile>
     422      <SubSystem>Console</SubSystem>
     423      <ImportLibrary>..\lib\qconvex.lib</ImportLibrary>
     424    </Link>
     425  </ItemDefinitionGroup>
    224426  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    225427    <Midl>
    … …  
    241443      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    242444      <ExceptionHandling />
     445      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     446      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     447      <AssemblerListingLocation>RelWithDebInfo</AssemblerListingLocation>
     448      <ObjectFileName>$(IntDir)</ObjectFileName>
     449      <ProgramDataBaseFileName>..\bin\qconvex.pdb</ProgramDataBaseFileName>
     450      <WarningLevel>Level3</WarningLevel>
     451      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     452      <CompileAs>CompileAsC</CompileAs>
     453    </ClCompile>
     454    <ResourceCompile>
     455      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     456      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     457    </ResourceCompile>
     458    <ProjectReference>
     459      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     460    </ProjectReference>
     461    <Link>
     462      <AdditionalOptions> /STACK:10000000 /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
     463      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullstatic.lib</AdditionalDependencies>
     464      <OutputFile>..\bin\qconvex.exe</OutputFile>
     465      <Version>6.0</Version>
     466      <GenerateDebugInformation>true</GenerateDebugInformation>
     467      <ProgramDatabaseFile>..\bin\qconvex.pdb</ProgramDatabaseFile>
     468      <SubSystem>Console</SubSystem>
     469      <ImportLibrary>..\lib\qconvex.lib</ImportLibrary>
     470    </Link>
     471  </ItemDefinitionGroup>
     472  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     473    <Midl>
     474      <MkTypLibCompatible>false</MkTypLibCompatible>
     475      <GenerateStublessProxies>true</GenerateStublessProxies>
     476      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     477      <OutputDirectory>$(IntDir)</OutputDirectory>
     478      <HeaderFileName>%(Filename).h</HeaderFileName>
     479      <DllDataFileName>
     480      </DllDataFileName>
     481      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     482      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     483    </Midl>
     484    <ClCompile>
     485      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     486      <Optimization>MaxSpeed</Optimization>
     487      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     488      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     489      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     490      <ExceptionHandling>
     491      </ExceptionHandling>
    243492      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    244493      <RuntimeTypeInfo>false</RuntimeTypeInfo>
Note: See TracChangeset for help on using the changeset viewer.