Commit ea34f4fb authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into 428-main-branch-crash-on-windows

parents 2957270d 7608f8f4

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "5 minutes"

  timeout: "10 minutes"

  stage: test

  needs: ["build-codec-linux-cmake"]

  script:

Workspace_msvc/lib_com.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

Workspace_msvc/lib_debug.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />

Workspace_msvc/lib_dec.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -282,6 +282,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -521,6 +521,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">