Commit 9ad0efa5 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'evs_basop_alt_code_instrumented' of... 

Merge branch 'evs_basop_alt_code_instrumented' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into evs_basop_alt_code_instrumented
parents 22abe72c bf173b36

Workspace_msvc/common.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{39EC200D-7795-4FF8-B214-B24EDA5526AE}</ProjectGuid>

    <RootNamespace>common</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -86,7 +86,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/evs_dec.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

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

    <RootNamespace>evs_dec</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -111,7 +111,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/evs_enc.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{824DA4CF-06F0-45C9-929A-8792F0E19C3E}</ProjectGuid>

    <RootNamespace>evs_enc</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -72,7 +72,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/lib_debug.vcxproj

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{54509728-928B-44D9-A118-A6F92F08B34F}</ProjectGuid>

    <RootNamespace>debug</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -87,7 +87,7 @@ 
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <WholeProgramOptimization>false</WholeProgramOptimization>

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

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\basic_op;..\basic_math;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/lib_fx.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -49,18 +49,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}</ProjectGuid>

    <RootNamespace>lib_fx</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

    <WholeProgramOptimization>true</WholeProgramOptimization>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -103,7 +103,7 @@ 
      <Optimization>MaxSpeed</Optimization>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <WholeProgramOptimization>false</WholeProgramOptimization>

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

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

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <BasicRuntimeChecks>Default</BasicRuntimeChecks>