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/user_eg3.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>
    … …  
    87148    <LinkIncremental>false</LinkIncremental>
    88149  </PropertyGroup>
     150  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     151    <LinkIncremental>false</LinkIncremental>
     152  </PropertyGroup>
    89153  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    90154    <Midl>
    … …  
    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;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     218      <ExceptionHandling>Sync</ExceptionHandling>
     219      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     220      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     221      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     222      <AssemblerListingLocation>Debug</AssemblerListingLocation>
     223      <ObjectFileName>$(IntDir)</ObjectFileName>
     224      <ProgramDataBaseFileName>..\bin\user_eg3.pdb</ProgramDataBaseFileName>
     225      <WarningLevel>Level3</WarningLevel>
     226      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     227      <CompileAs>CompileAsCpp</CompileAs>
     228    </ClCompile>
     229    <ResourceCompile>
     230      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     231      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\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;..\lib\qhullcpp_d.lib;..\lib\qhullstatic_pd.lib</AdditionalDependencies>
     239      <OutputFile>..\bin\user_eg3.exe</OutputFile>
     240      <Version>6.0</Version>
     241      <GenerateDebugInformation>true</GenerateDebugInformation>
     242      <ProgramDatabaseFile>..\bin\user_eg3.pdb</ProgramDatabaseFile>
     243      <SubSystem>Console</SubSystem>
     244      <ImportLibrary>..\lib\user_eg3.lib</ImportLibrary>
     245    </Link>
     246  </ItemDefinitionGroup>
    136247  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    137248    <Midl>
    … …  
    178289    </Link>
    179290  </ItemDefinitionGroup>
     291  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     292    <Midl>
     293      <MkTypLibCompatible>false</MkTypLibCompatible>
     294      <GenerateStublessProxies>true</GenerateStublessProxies>
     295      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     296      <OutputDirectory>$(IntDir)</OutputDirectory>
     297      <HeaderFileName>%(Filename).h</HeaderFileName>
     298      <DllDataFileName>
     299      </DllDataFileName>
     300      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     301      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     302    </Midl>
     303    <ClCompile>
     304      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     305      <Optimization>MaxSpeed</Optimization>
     306      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     307      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     308      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     309      <ExceptionHandling>Sync</ExceptionHandling>
     310      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     311      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     312      <AssemblerListingLocation>Release</AssemblerListingLocation>
     313      <ObjectFileName>$(IntDir)</ObjectFileName>
     314      <ProgramDataBaseFileName>..\bin\user_eg3.pdb</ProgramDataBaseFileName>
     315      <WarningLevel>Level3</WarningLevel>
     316      <CompileAs>CompileAsCpp</CompileAs>
     317    </ClCompile>
     318    <ResourceCompile>
     319      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     320      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     321    </ResourceCompile>
     322    <ProjectReference>
     323      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     324    </ProjectReference>
     325    <Link>
     326      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     327      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullcpp.lib;..\lib\qhullstatic_p.lib</AdditionalDependencies>
     328      <OutputFile>..\bin\user_eg3.exe</OutputFile>
     329      <Version>6.0</Version>
     330      <ProgramDatabaseFile>..\bin\user_eg3.pdb</ProgramDatabaseFile>
     331      <SubSystem>Console</SubSystem>
     332      <ImportLibrary>..\lib\user_eg3.lib</ImportLibrary>
     333    </Link>
     334  </ItemDefinitionGroup>
    180335  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
    181336    <Midl>
    … …  
    222377    </Link>
    223378  </ItemDefinitionGroup>
     379  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     380    <Midl>
     381      <MkTypLibCompatible>false</MkTypLibCompatible>
     382      <GenerateStublessProxies>true</GenerateStublessProxies>
     383      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     384      <OutputDirectory>$(IntDir)</OutputDirectory>
     385      <HeaderFileName>%(Filename).h</HeaderFileName>
     386      <DllDataFileName>
     387      </DllDataFileName>
     388      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     389      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     390    </Midl>
     391    <ClCompile>
     392      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     393      <Optimization>MinSpace</Optimization>
     394      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     395      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     396      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     397      <ExceptionHandling>Sync</ExceptionHandling>
     398      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     399      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     400      <AssemblerListingLocation>MinSizeRel</AssemblerListingLocation>
     401      <ObjectFileName>$(IntDir)</ObjectFileName>
     402      <ProgramDataBaseFileName>..\bin\user_eg3.pdb</ProgramDataBaseFileName>
     403      <WarningLevel>Level3</WarningLevel>
     404      <CompileAs>CompileAsCpp</CompileAs>
     405    </ClCompile>
     406    <ResourceCompile>
     407      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     408      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     409    </ResourceCompile>
     410    <ProjectReference>
     411      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     412    </ProjectReference>
     413    <Link>
     414      <AdditionalOptions> /STACK:10000000 /machine:X86 %(AdditionalOptions)</AdditionalOptions>
     415      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullcpp.lib;..\lib\qhullstatic_p.lib</AdditionalDependencies>
     416      <OutputFile>..\bin\user_eg3.exe</OutputFile>
     417      <Version>6.0</Version>
     418      <ProgramDatabaseFile>..\bin\user_eg3.pdb</ProgramDatabaseFile>
     419      <SubSystem>Console</SubSystem>
     420      <ImportLibrary>..\lib\user_eg3.lib</ImportLibrary>
     421    </Link>
     422  </ItemDefinitionGroup>
    224423  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
    225424    <Midl>
    … …  
    231430      <HeaderFileName>%(Filename).h</HeaderFileName>
    232431      <DllDataFileName />
     432      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
     433      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
     434    </Midl>
     435    <ClCompile>
     436      <AdditionalOptions> /Zm1000 %(AdditionalOptions)</AdditionalOptions>
     437      <Optimization>MaxSpeed</Optimization>
     438      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
     439      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     440      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     441      <ExceptionHandling>Sync</ExceptionHandling>
     442      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     443      <RuntimeTypeInfo>false</RuntimeTypeInfo>
     444      <AssemblerListingLocation>RelWithDebInfo</AssemblerListingLocation>
     445      <ObjectFileName>$(IntDir)</ObjectFileName>
     446      <ProgramDataBaseFileName>..\bin\user_eg3.pdb</ProgramDataBaseFileName>
     447      <WarningLevel>Level3</WarningLevel>
     448      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     449      <CompileAs>CompileAsCpp</CompileAs>
     450    </ClCompile>
     451    <ResourceCompile>
     452      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;qh_QHpointer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     453      <AdditionalIncludeDirectories>..\src\libqhullcpp;..\src;..\src\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     454    </ResourceCompile>
     455    <ProjectReference>
     456      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     457    </ProjectReference>
     458    <Link>
     459      <AdditionalOptions> /STACK:10000000 /machine:X86 /debug %(AdditionalOptions)</AdditionalOptions>
     460      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\lib\qhullcpp.lib;..\lib\qhullstatic_p.lib</AdditionalDependencies>
     461      <OutputFile>..\bin\user_eg3.exe</OutputFile>
     462      <Version>6.0</Version>
     463      <GenerateDebugInformation>true</GenerateDebugInformation>
     464      <ProgramDatabaseFile>..\bin\user_eg3.pdb</ProgramDatabaseFile>
     465      <SubSystem>Console</SubSystem>
     466      <ImportLibrary>..\lib\user_eg3.lib</ImportLibrary>
     467    </Link>
     468  </ItemDefinitionGroup>
     469  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     470    <Midl>
     471      <MkTypLibCompatible>false</MkTypLibCompatible>
     472      <GenerateStublessProxies>true</GenerateStublessProxies>
     473      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
     474      <OutputDirectory>$(IntDir)</OutputDirectory>
     475      <HeaderFileName>%(Filename).h</HeaderFileName>
     476      <DllDataFileName>
     477      </DllDataFileName>
    233478      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
    234479      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
Note: See TracChangeset for help on using the changeset viewer.