mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-10-31 01:10:24 -04:00
4059767dc4
--User changes Thread image writing in EmberAnimate and when doing animation sequence in final render dialog. Add total time output for verbose mode in EmberAnimate to match EmberRender. --Bug Fixes Fix incorrect iters ran/requested percentage in EmberAnimate to match EmberRender. Fix motion blur being disabled when doing animations in final render dialog. Allow for boolean command line options which default to true to be set to false. --Code Changes Minor changes to enable a Mac build. Double the memory required for the final output buffer in RendererBase::MemoryRequired() when threading image writing. Reuse same buffer for RgbaToRgb() in EmberRender and EmberAnimate. Only resize in RgbaToRgb() if the two vectors are not the same. Add a final output buffer ping-ponging mechanism to facilitate threaded writes in controllers.
74 lines
3.8 KiB
XML
74 lines
3.8 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<PropertyGroup>
|
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
|
<ProductVersion>3.7</ProductVersion>
|
|
<ProjectGuid>{c8096c47-e358-438c-a520-146d46b0637d}</ProjectGuid>
|
|
<SchemaVersion>2.0</SchemaVersion>
|
|
<OutputName>Fractorium_Beta_0.4.1.8</OutputName>
|
|
<OutputType>Package</OutputType>
|
|
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
|
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
|
<OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
|
<DefineConstants>Debug</DefineConstants>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
|
<OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
|
<DefineConstants>Debug</DefineConstants>
|
|
<OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
|
<OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
<SuppressPdbOutput>True</SuppressPdbOutput>
|
|
<WixVariables>
|
|
</WixVariables>
|
|
<DefineConstants>GpuType=AMD</DefineConstants>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNvidia|x86' ">
|
|
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNvidia|x64' ">
|
|
<SuppressPdbOutput>True</SuppressPdbOutput>
|
|
<OutputPath>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
<WixVariables>
|
|
</WixVariables>
|
|
<DefineConstants>GpuType=NVIDIA</DefineConstants>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNvidia|AnyCPU' ">
|
|
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNvidia|Any CPU' ">
|
|
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
|
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<Compile Include="Product.wxs" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<WixExtension Include="WixUIExtension">
|
|
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
|
|
<Name>WixUIExtension</Name>
|
|
</WixExtension>
|
|
</ItemGroup>
|
|
<Import Project="$(WixTargetsPath)" />
|
|
<!--
|
|
To modify your build process, add your task inside one of the targets below and uncomment it.
|
|
Other similar extension points exist, see Wix.targets.
|
|
<Target Name="BeforeBuild">
|
|
</Target>
|
|
<Target Name="AfterBuild">
|
|
</Target>
|
|
-->
|
|
</Project> |