Commit 4b2828fa authored by vaclav's avatar vaclav
Browse files

- unify use of "#define WMC_TOOL_SKIP" with IVAS FLP 

- change platform toolset
- fix include directories
parent 7617370a

Workspace_msvc/common.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ 
  <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>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

  <ImportGroup Label="ExtensionSettings">
@@ -93,7 +93,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/debug.vcxproj

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

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

    <RootNamespace>debug</RootNamespace>

    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

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

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -32,7 +32,7 @@ 
  </PropertyGroup>

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

    <WholeProgramOptimization>true</WholeProgramOptimization>

  </PropertyGroup>
@@ -73,7 +73,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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />
@@ -124,7 +124,7 @@ 
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <WholeProgramOptimization>false</WholeProgramOptimization>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/evs_dec.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ 
  <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>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

    <ConfigurationType>Application</ConfigurationType>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

  <ImportGroup Label="ExtensionSettings">
@@ -112,7 +112,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/evs_enc.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ 
  <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>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

    <ConfigurationType>Application</ConfigurationType>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

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

  <ImportGroup Label="ExtensionSettings">
@@ -72,7 +72,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

lib_com/ari.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#define int32   int

#endif



#define WMC_TOOL_SKIP





/*---------------------------------------------------------------