Commit 70e5a349 authored by vaclav's avatar vaclav
Browse files

Merge branch 'merge_update_of_main_pc' into 'main-pc' 

[skip-name-check] merge update of main-pc

See merge request !1683
parents c06bdd95 0b547b1f

Workspace_msvc/lib_com.vcxproj.filters

+40 −12
Original line number Diff line number Diff line
@@ -508,6 +508,12 @@ 
    <ClCompile Include="..\lib_com\tec_com_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_limiter_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_rotation_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -588,17 +594,39 @@ 
    <ClInclude Include="..\lib_com\prot_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\complex_basop.h" />

    <ClInclude Include="..\lib_com\enh32.h" />

    <ClInclude Include="..\lib_com\enh64.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h" />

    <ClInclude Include="..\lib_com\log2.h" />

    <ClInclude Include="..\lib_com\math_32.h" />

    <ClInclude Include="..\lib_com\math_op.h" />

    <ClInclude Include="..\lib_com\mime.h" />

    <ClInclude Include="..\lib_com\oper_32b.h" />

    <ClInclude Include="..\lib_com\rom_basic_math.h" />

    <ClInclude Include="..\lib_com\typedefs.h" />

    <ClInclude Include="..\lib_com\complex_basop.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\enh32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\enh64.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\log2.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\math_32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\math_op.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\mime.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\oper_32b.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\rom_basic_math.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\typedefs.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

lib_com/ivas_prot.h

deleted100644 → 0
+0 −4068

File deleted.

Preview size limit exceeded, changes collapsed.