Changeset 1129 in SHVCSoftware


Ignore:
Timestamp:
7 Jul 2015, 03:01:11 (9 years ago)
Author:
seregin
Message:

revert r1127

Location:
branches/SHM-dev/build
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/build/linux/common/makefile.base

    r1127 r1129  
    4848# default cpp flags for all configurations
    4949#CPPFLAGS          = -Wall -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
    50 #CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
    51 CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare
     50CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
    5251
    5352##########

  • branches/SHM-dev/build/vc10/TAppDecoder_vc10.vcxproj

    r1127 r1129  
    122122      <SubSystem>Console</SubSystem>
    123123      <TargetMachine>MachineX64</TargetMachine>
    124       <StackReserveSize>8000000</StackReserveSize>
    125124    </Link>
    126125  </ItemDefinitionGroup>

  • branches/SHM-dev/build/vc10/TAppDecoder_vc10.vcxproj.user

    r1127 r1129  
    44    <LocalDebuggerWorkingDirectory>$(ProjectDir)/../../../</LocalDebuggerWorkingDirectory>
    55    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    6     <LocalDebuggerCommandArguments>-b str/Bus.bin -lid 1</LocalDebuggerCommandArguments>
     6    <LocalDebuggerCommandArguments>-b str/Bus.bin -ls 2</LocalDebuggerCommandArguments>
    77  </PropertyGroup>
    88  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    9     <LocalDebuggerCommandArguments> -b conformance/ADAPTRES_A_ERICSSON_1.bit -olsidx 2</LocalDebuggerCommandArguments>
     9    <LocalDebuggerCommandArguments>-b str/Bus.bin -ls 2</LocalDebuggerCommandArguments>
    1010  </PropertyGroup>
    1111  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    1313    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    1414  </PropertyGroup>
    15   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    16     <LocalDebuggerCommandArguments>-b conformance/LAYERID63_A_HHI_1.bin -lid 63</LocalDebuggerCommandArguments>
    17   </PropertyGroup>
    18   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    19     <LocalDebuggerWorkingDirectory>$(ProjectDir)/../../../</LocalDebuggerWorkingDirectory>
    20     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    21   </PropertyGroup>
    2215</Project>

  • branches/SHM-dev/build/vc10/TAppEncoder_vc10.vcxproj

    r1127 r1129  
    103103      <TargetMachine>MachineX86</TargetMachine>
    104104      <StackReserveSize>8000000</StackReserveSize>
    105       <HeapReserveSize>
    106       </HeapReserveSize>
    107       <HeapCommitSize>
    108       </HeapCommitSize>
    109       <StackCommitSize>
    110       </StackCommitSize>
    111       <LargeAddressAware>false</LargeAddressAware>
    112105    </Link>
    113106  </ItemDefinitionGroup>
    … …  
    130123      <SubSystem>Console</SubSystem>
    131124      <TargetMachine>MachineX64</TargetMachine>
    132       <StackReserveSize>8000000</StackReserveSize>
    133125    </Link>
    134126  </ItemDefinitionGroup>

  • branches/SHM-dev/build/vc10/TAppEncoder_vc10.vcxproj.user

    r1127 r1129  
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4     <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_intra_scalable.cfg -c cfg/layers.cfg -q0 38 -q1 38 -g 1 -f 2 -ip0 1 -ip1 1 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
     4    <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_randomaccess_scalable.cfg -c cfg/layers.cfg -q0 38 -q1 38 -g 8 -f 9 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
    55  </PropertyGroup>
    66  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    99  </PropertyGroup>
    1010  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    11     <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_randomaccess_scalable.cfg -c cfg/layers.cfg -q0 38 -q1 38 -g 8 -f 9 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
     11    <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/CactusCrop-2x.cfg -c cfg/encoder_randomaccess_main.cfg -q0 30 -q1 30 -g 8 -f 17 -b str/CactusCrop.bin -c option.cfg -ibl rec/CactusCropBL-2x_rec.yuv -ibs rec/CactusCropBL-2x_syntax.bin</LocalDebuggerCommandArguments>
    1212  </PropertyGroup>
    1313  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    1515    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    1616  </PropertyGroup>
    17   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    18     <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_randomaccess_scalable.cfg -c cfg/layers.cfg -q0 38 -q1 38 -g 8 -f 3 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
    19     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
    20     <LocalDebuggerWorkingDirectory>$(ProjectDir)/../../../</LocalDebuggerWorkingDirectory>
    21   </PropertyGroup>
    2217</Project>

  • branches/SHM-dev/build/vc10/TLibEncoder_vc10.vcxproj.filters

    r1127 r1129  
    6969      <Filter>Source Files</Filter>
    7070    </ClCompile>
    71     <ClCompile Include="..\..\source\Lib\TLibEncoder\TEnc3DAsymLUT.cpp">
    72       <Filter>Source Files</Filter>
    73     </ClCompile>
    7471  </ItemGroup>
    7572  <ItemGroup>
    … …  
    140137      <Filter>Header Files</Filter>
    141138    </ClInclude>
    142     <ClInclude Include="..\..\source\Lib\TLibEncoder\TEnc3DAsymLUT.h">
    143       <Filter>Header Files</Filter>
    144     </ClInclude>
    145139  </ItemGroup>
    146140</Project>
Note: See TracChangeset for help on using the changeset viewer.