Commit 9b0368e6 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 154-filter-output-of-sanitizer-tests-such-that-only-failing-conditions-are-stored
parents 2c3bb66e 81bba972

Workspace_msvc/renderer.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ 
      <Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_dec.vcxproj">

      <Project>{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_util.vcxproj">

      <Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj

+5 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
      <Optimization>Disabled</Optimization>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>false</ConformanceMode>

      <AdditionalIncludeDirectories>..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_util;..\..\..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <SupportJustMyCode>false</SupportJustMyCode>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions);TDREND_HRTF_TABLE_METHODS</PreprocessorDefinitions>
@@ -83,7 +83,7 @@ 
      <IntrinsicFunctions>true</IntrinsicFunctions>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>true</ConformanceMode>

      <AdditionalIncludeDirectories>..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_util;..\..\..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions);OBJECT_RENDERER_EXTERNAL_METADATA</PreprocessorDefinitions>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <ProgramDataBaseFileName>$(IntDir)renderer_standalone.pdb</ProgramDataBaseFileName>
@@ -108,6 +108,9 @@ 
    <ProjectReference Include="..\..\..\Workspace_msvc\lib_dec.vcxproj">

      <Project>{e822ddaf-0f5f-4cd0-a694-38ae69de74d3}</Project>

    </ProjectReference>

    <ProjectReference Include="..\..\..\Workspace_msvc\lib_rend.vcxproj">

      <Project>{718de063-a18b-bb72-9150-62b892e6ffa6}</Project>

    </ProjectReference>

    <ProjectReference Include="..\..\..\Workspace_msvc\lib_util.vcxproj">

      <Project>{2fa8f384-0775-f3b7-f8c3-85209222fc70}</Project>

    </ProjectReference>