Changeset 540 in SHVCSoftware for trunk/build


Ignore:
Timestamp:
9 Jan 2014, 05:04:17 (11 years ago)
Author:
seregin
Message:

merge SHM-4.1-dev branch

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/build/linux/app/TAppDownConvert/makefile

    r341 r540  
    2727OBJS                    =       \
    2828                                        $(OBJ_DIR)/TAppDownConvert.o \
     29                                        $(OBJ_DIR)/DownConvert.o \
     30                                       
    2931
    3032# set libs to link with

  • trunk/build/vc10/TAppDownConvert/TAppDownConvert.vcxproj

    r344 r540  
    123123  </ItemDefinitionGroup>
    124124  <ItemGroup>
     125    <ClCompile Include="..\..\..\source\App\TAppDownConvert\DownConvert.cpp" />
    125126    <ClCompile Include="..\..\..\source\App\TAppDownConvert\TAppDownConvert.cpp" />
     127  </ItemGroup>
     128  <ItemGroup>
     129    <ClInclude Include="..\..\..\source\App\TAppDownConvert\DownConvert.h" />
    126130  </ItemGroup>
    127131  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Note: See TracChangeset for help on using the changeset viewer.