Changeset 56 in 3DVCSoftware for trunk/build/vc10


Ignore:
Timestamp:
11 May 2012, 21:20:17 (13 years ago)
Author:
hschwarz
Message:

updated trunk (move to HM6.1)

Location:
trunk/build/vc10
Files:
11 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/build/vc10/TAppCommon_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     66    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     67    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6668    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6769    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7070    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7171    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
     88      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8889      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8990      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9293      <WarningLevel>Level3</WarningLevel>
    9394      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     95    </ClCompile>
     96  </ItemDefinitionGroup>
     97  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     98    <Midl>
     99      <TargetEnvironment>X64</TargetEnvironment>
     100    </Midl>
     101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     104      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <MinimalRebuild>true</MinimalRebuild>
     106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     108      <WarningLevel>Level3</WarningLevel>
     109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95110    </ClCompile>
    96111  </ItemDefinitionGroup>
    … …  
    101116      <IntrinsicFunctions>false</IntrinsicFunctions>
    102117      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104120      <StringPooling>true</StringPooling>
    105121      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106122      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122123      <WarningLevel>Level3</WarningLevel>
    123124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133134      <IntrinsicFunctions>false</IntrinsicFunctions>
    134135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     136      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     137      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136138      <StringPooling>true</StringPooling>
    137139      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    142144  </ItemDefinitionGroup>
    143145  <ItemGroup>
    144     <ClCompile Include="..\..\source\App\TAppCommon\program_options_lite.cpp" />
    145     <ClCompile Include="..\..\source\App\TAppCommon\TAppComCamPara.cpp" />
     146    <ClCompile Include="..\..\source\Lib\TAppCommon\program_options_lite.cpp" />
     147    <ClCompile Include="..\..\source\Lib\TAppCommon\TAppComCamPara.cpp" />
    146148  </ItemGroup>
    147149  <ItemGroup>
    148     <ClInclude Include="..\..\source\App\TAppCommon\program_options_lite.h" />
    149     <ClInclude Include="..\..\source\App\TAppCommon\TAppComCamPara.h" />
     150    <ClInclude Include="..\..\source\Lib\TAppCommon\program_options_lite.h" />
     151    <ClInclude Include="..\..\source\Lib\TAppCommon\TAppComCamPara.h" />
    150152  </ItemGroup>
    151153  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  • trunk/build/vc10/TAppDecoder_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6666    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     67    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
     68    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     69    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    6770    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    6871    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6972    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    72     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7373    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    7474    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    9090    <ClCompile>
    9191      <Optimization>Disabled</Optimization>
     92      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9293      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9394      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9697      <WarningLevel>Level3</WarningLevel>
    9798      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    98       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    99     </ClCompile>
    100     <Link>
    101       <GenerateDebugInformation>true</GenerateDebugInformation>
    102       <SubSystem>Console</SubSystem>
    103       <TargetMachine>MachineX86</TargetMachine>
    104     </Link>
    105   </ItemDefinitionGroup>
    106   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    107     <ClCompile>
    108       <Optimization>MaxSpeed</Optimization>
    109       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
    110       <IntrinsicFunctions>false</IntrinsicFunctions>
    111       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    112       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    113       <StringPooling>true</StringPooling>
    114       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    115       <FunctionLevelLinking>true</FunctionLevelLinking>
    116       <WarningLevel>Level3</WarningLevel>
    117       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    118       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    11999    </ClCompile>
    120100    <Link>
    … …  
    130110    <ClCompile>
    131111      <Optimization>Disabled</Optimization>
     112      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    132113      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133114      <MinimalRebuild>true</MinimalRebuild>
    … …  
    143124    </Link>
    144125  </ItemDefinitionGroup>
     126  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     127    <ClCompile>
     128      <Optimization>MaxSpeed</Optimization>
     129      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     130      <IntrinsicFunctions>false</IntrinsicFunctions>
     131      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     132      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     133      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     134      <StringPooling>true</StringPooling>
     135      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     136      <FunctionLevelLinking>true</FunctionLevelLinking>
     137      <WarningLevel>Level3</WarningLevel>
     138      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     139    </ClCompile>
     140    <Link>
     141      <GenerateDebugInformation>true</GenerateDebugInformation>
     142      <SubSystem>Console</SubSystem>
     143      <TargetMachine>MachineX86</TargetMachine>
     144    </Link>
     145  </ItemDefinitionGroup>
    145146  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    146147    <Midl>
    … …  
    152153      <IntrinsicFunctions>false</IntrinsicFunctions>
    153154      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    154       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     155      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     156      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    155157      <StringPooling>true</StringPooling>
    156158      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    177179    <ProjectReference Include="TAppCommon_vc10.vcxproj">
    178180      <Project>{d1e8a1c2-15db-4c94-80e8-4f70cf0a2dc5}</Project>
     181      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    179182    </ProjectReference>
    180183    <ProjectReference Include="TLibCommon_vc10.vcxproj">

  • trunk/build/vc10/TAppEncoder_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6666    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     67    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
     68    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     69    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    6770    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    6871    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6972    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    72     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    7373    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\bin\vc10\$(Platform)\$(Configuration)\</OutDir>
    7474    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    9090    <ClCompile>
    9191      <Optimization>Disabled</Optimization>
     92      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9293      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9394      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9697      <WarningLevel>Level3</WarningLevel>
    9798      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    98       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    9999    </ClCompile>
    100100    <Link>
    … …  
    102102      <SubSystem>Console</SubSystem>
    103103      <TargetMachine>MachineX86</TargetMachine>
     104    </Link>
     105  </ItemDefinitionGroup>
     106  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     107    <Midl>
     108      <TargetEnvironment>X64</TargetEnvironment>
     109    </Midl>
     110    <ClCompile>
     111      <Optimization>Disabled</Optimization>
     112      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     113      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     114      <MinimalRebuild>true</MinimalRebuild>
     115      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     116      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     117      <WarningLevel>Level3</WarningLevel>
     118      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     119    </ClCompile>
     120    <Link>
     121      <GenerateDebugInformation>true</GenerateDebugInformation>
     122      <SubSystem>Console</SubSystem>
     123      <TargetMachine>MachineX64</TargetMachine>
    104124    </Link>
    105125  </ItemDefinitionGroup>
    … …  
    110130      <IntrinsicFunctions>false</IntrinsicFunctions>
    111131      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    112       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     132      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     133      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    113134      <StringPooling>true</StringPooling>
    114135      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    116137      <WarningLevel>Level3</WarningLevel>
    117138      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    118       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    119139    </ClCompile>
    120140    <Link>
    … …  
    122142      <SubSystem>Console</SubSystem>
    123143      <TargetMachine>MachineX86</TargetMachine>
    124     </Link>
    125   </ItemDefinitionGroup>
    126   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    127     <Midl>
    128       <TargetEnvironment>X64</TargetEnvironment>
    129     </Midl>
    130     <ClCompile>
    131       <Optimization>Disabled</Optimization>
    132       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <MinimalRebuild>true</MinimalRebuild>
    134       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    135       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    136       <WarningLevel>Level3</WarningLevel>
    137       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    138     </ClCompile>
    139     <Link>
    140       <GenerateDebugInformation>true</GenerateDebugInformation>
    141       <SubSystem>Console</SubSystem>
    142       <TargetMachine>MachineX64</TargetMachine>
    143144    </Link>
    144145  </ItemDefinitionGroup>
    … …  
    152153      <IntrinsicFunctions>false</IntrinsicFunctions>
    153154      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    154       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     155      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     156      <PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    155157      <StringPooling>true</StringPooling>
    156158      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

  • trunk/build/vc10/TAppRenderer_vc10.vcxproj

    r2 r56  
    9696      <WarningLevel>Level3</WarningLevel>
    9797      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    98       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     98      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9999    </ClCompile>
    100100    <Link>
    … …  
    116116      <WarningLevel>Level3</WarningLevel>
    117117      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    118       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    119119    </ClCompile>
    120120    <Link>
    … …  
    136136      <WarningLevel>Level3</WarningLevel>
    137137      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     138      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    138139    </ClCompile>
    139140    <Link>
    … …  
    158159      <WarningLevel>Level3</WarningLevel>
    159160      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     161      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    160162    </ClCompile>
    161163    <Link>

  • trunk/build/vc10/TLibCommon_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     66    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     67    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6668    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6769    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7070    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7171    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
     88      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8889      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8990      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9293      <WarningLevel>Level3</WarningLevel>
    9394      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     95    </ClCompile>
     96  </ItemDefinitionGroup>
     97  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     98    <Midl>
     99      <TargetEnvironment>X64</TargetEnvironment>
     100    </Midl>
     101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     104      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <MinimalRebuild>true</MinimalRebuild>
     106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     108      <WarningLevel>Level3</WarningLevel>
     109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95110    </ClCompile>
    96111  </ItemDefinitionGroup>
    … …  
    101116      <IntrinsicFunctions>false</IntrinsicFunctions>
    102117      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104120      <StringPooling>true</StringPooling>
    105121      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106122      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122123      <WarningLevel>Level3</WarningLevel>
    123124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133134      <IntrinsicFunctions>false</IntrinsicFunctions>
    134135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     136      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     137      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136138      <StringPooling>true</StringPooling>
    137139      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    142144  </ItemDefinitionGroup>
    143145  <ItemGroup>
    144     <ClCompile Include="..\..\source\Lib\libmd5\libmd5.c" />
    145146    <ClCompile Include="..\..\source\Lib\TLibCommon\ContextModel.cpp" />
    146147    <ClCompile Include="..\..\source\Lib\TLibCommon\ContextModel3DBuffer.cpp" />
     148    <ClCompile Include="..\..\source\Lib\libmd5\libmd5.c" />
    147149    <ClCompile Include="..\..\source\Lib\TLibCommon\TComAdaptiveLoopFilter.cpp" />
    148150    <ClCompile Include="..\..\source\Lib\TLibCommon\TComBitStream.cpp" />
    … …  
    150152    <ClCompile Include="..\..\source\Lib\TLibCommon\TComDataCU.cpp" />
    151153    <ClCompile Include="..\..\source\Lib\TLibCommon\TComDepthMapGenerator.cpp" />
     154    <ClCompile Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.cpp" />
    152155    <ClCompile Include="..\..\source\Lib\TLibCommon\TComLoopFilter.cpp" />
    153156    <ClCompile Include="..\..\source\Lib\TLibCommon\TComMotionInfo.cpp" />
    154     <ClCompile Include="..\..\source\Lib\TLibCommon\TComMVDRefData.cpp" />
    155157    <ClCompile Include="..\..\source\Lib\TLibCommon\TComPattern.cpp" />
    156158    <ClCompile Include="..\..\source\Lib\TLibCommon\TComPic.cpp" />
    … …  
    158160    <ClCompile Include="..\..\source\Lib\TLibCommon\TComPicYuv.cpp" />
    159161    <ClCompile Include="..\..\source\Lib\TLibCommon\TComPicYuvMD5.cpp" />
    160     <ClCompile Include="..\..\source\Lib\TLibCommon\TComPredFilter.cpp" />
    161162    <ClCompile Include="..\..\source\Lib\TLibCommon\TComPrediction.cpp" />
    162163    <ClCompile Include="..\..\source\Lib\TLibCommon\TComRdCost.cpp" />
    … …  
    164165    <ClCompile Include="..\..\source\Lib\TLibCommon\TComResidualGenerator.cpp" />
    165166    <ClCompile Include="..\..\source\Lib\TLibCommon\TComRom.cpp" />
     167    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSampleAdaptiveOffset.cpp" />
    166168    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSlice.cpp" />
    167169    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" />
    … …  
    171173  </ItemGroup>
    172174  <ItemGroup>
    173     <ClInclude Include="..\..\source\Lib\libmd5\libmd5.h" />
    174     <ClInclude Include="..\..\source\Lib\libmd5\MD5.h" />
     175    <ClInclude Include="..\..\source\Lib\TLibCommon\AccessUnit.h" />
    175176    <ClInclude Include="..\..\source\Lib\TLibCommon\CommonDef.h" />
    176177    <ClInclude Include="..\..\source\Lib\TLibCommon\ContextModel.h" />
    177178    <ClInclude Include="..\..\source\Lib\TLibCommon\ContextModel3DBuffer.h" />
    178179    <ClInclude Include="..\..\source\Lib\TLibCommon\ContextTables.h" />
     180    <ClInclude Include="..\..\source\Lib\libmd5\libmd5.h" />
     181    <ClInclude Include="..\..\source\Lib\libmd5\MD5.h" />
     182    <ClInclude Include="..\..\source\Lib\TLibCommon\NAL.h" />
    179183    <ClInclude Include="..\..\source\Lib\TLibCommon\SEI.h" />
    180184    <ClInclude Include="..\..\source\Lib\TLibCommon\TComAdaptiveLoopFilter.h" />
    … …  
    184188    <ClInclude Include="..\..\source\Lib\TLibCommon\TComDataCU.h" />
    185189    <ClInclude Include="..\..\source\Lib\TLibCommon\TComDepthMapGenerator.h" />
     190    <ClInclude Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.h" />
    186191    <ClInclude Include="..\..\source\Lib\TLibCommon\TComList.h" />
    187192    <ClInclude Include="..\..\source\Lib\TLibCommon\TComLoopFilter.h" />
    188193    <ClInclude Include="..\..\source\Lib\TLibCommon\TComMotionInfo.h" />
    189194    <ClInclude Include="..\..\source\Lib\TLibCommon\TComMv.h" />
    190     <ClInclude Include="..\..\source\Lib\TLibCommon\TComMVDRefData.h" />
    191195    <ClInclude Include="..\..\source\Lib\TLibCommon\TComPattern.h" />
    192196    <ClInclude Include="..\..\source\Lib\TLibCommon\TComPic.h" />
    193197    <ClInclude Include="..\..\source\Lib\TLibCommon\TComPicSym.h" />
    194198    <ClInclude Include="..\..\source\Lib\TLibCommon\TComPicYuv.h" />
    195     <ClInclude Include="..\..\source\Lib\TLibCommon\TComPredFilter.h" />
    196199    <ClInclude Include="..\..\source\Lib\TLibCommon\TComPrediction.h" />
    197200    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRdCost.h" />
    … …  
    199202    <ClInclude Include="..\..\source\Lib\TLibCommon\TComResidualGenerator.h" />
    200203    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRom.h" />
     204    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSampleAdaptiveOffset.h" />
    201205    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSlice.h" />
    202206    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTrQuant.h" />

  • trunk/build/vc10/TLibDecoder_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     66    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     67    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6668    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6769    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7070    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7171    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
     88      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8889      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8990      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9293      <WarningLevel>Level3</WarningLevel>
    9394      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     95    </ClCompile>
     96  </ItemDefinitionGroup>
     97  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     98    <Midl>
     99      <TargetEnvironment>X64</TargetEnvironment>
     100    </Midl>
     101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     104      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <MinimalRebuild>true</MinimalRebuild>
     106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     108      <WarningLevel>Level3</WarningLevel>
     109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95110    </ClCompile>
    96111  </ItemDefinitionGroup>
    … …  
    101116      <IntrinsicFunctions>false</IntrinsicFunctions>
    102117      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104120      <StringPooling>true</StringPooling>
    105121      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106122      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122123      <WarningLevel>Level3</WarningLevel>
    123124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133134      <IntrinsicFunctions>false</IntrinsicFunctions>
    134135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     136      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     137      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136138      <StringPooling>true</StringPooling>
    137139      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    142144  </ItemDefinitionGroup>
    143145  <ItemGroup>
     146    <ClCompile Include="..\..\source\Lib\TLibDecoder\AnnexBread.cpp" />
     147    <ClCompile Include="..\..\source\Lib\TLibDecoder\NALread.cpp" />
    144148    <ClCompile Include="..\..\source\Lib\TLibDecoder\SEIread.cpp" />
    145149    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    … …  
    153157  </ItemGroup>
    154158  <ItemGroup>
     159    <ClInclude Include="..\..\source\Lib\TLibDecoder\AnnexBread.h" />
     160    <ClInclude Include="..\..\source\Lib\TLibDecoder\NALread.h" />
    155161    <ClInclude Include="..\..\source\Lib\TLibDecoder\SEIread.h" />
    156162    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoder.h" />

  • trunk/build/vc10/TLibEncoder_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     66    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     67    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6668    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6769    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7070    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7171    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
     88      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8889      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8990      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9293      <WarningLevel>Level3</WarningLevel>
    9394      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     95    </ClCompile>
     96  </ItemDefinitionGroup>
     97  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     98    <Midl>
     99      <TargetEnvironment>X64</TargetEnvironment>
     100    </Midl>
     101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     104      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <MinimalRebuild>true</MinimalRebuild>
     106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     108      <WarningLevel>Level3</WarningLevel>
     109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95110    </ClCompile>
    96111  </ItemDefinitionGroup>
    … …  
    101116      <IntrinsicFunctions>false</IntrinsicFunctions>
    102117      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104120      <StringPooling>true</StringPooling>
    105121      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106122      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122123      <WarningLevel>Level3</WarningLevel>
    123124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133134      <IntrinsicFunctions>false</IntrinsicFunctions>
    134135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     136      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     137      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136138      <StringPooling>true</StringPooling>
    137139      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    142144  </ItemDefinitionGroup>
    143145  <ItemGroup>
     146    <ClCompile Include="..\..\source\Lib\TLibEncoder\NALwrite.cpp" />
    144147    <ClCompile Include="..\..\source\Lib\TLibEncoder\SEIwrite.cpp" />
    145148    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncAdaptiveLoopFilter.cpp" />
    146149    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncBinCoderCABAC.cpp" />
     150    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncBinCoderCABACCounter.cpp" />
    147151    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncCavlc.cpp" />
    148152    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncCu.cpp" />
    149153    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncEntropy.cpp" />
    150     <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncFormattedStringParser.cpp" />
    151154    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncGOP.cpp" />
     155    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncPic.cpp" />
     156    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncPreanalyzer.cpp" />
     157    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncSampleAdaptiveOffset.cpp" />
    152158    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncSbac.cpp" />
    153159    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncSearch.cpp" />
    154     <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncSeqStructure.cpp" />
    155160    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncSlice.cpp" />
    156161    <ClCompile Include="..\..\source\Lib\TLibEncoder\TEncTop.cpp" />
    … …  
    158163  </ItemGroup>
    159164  <ItemGroup>
     165    <ClInclude Include="..\..\source\Lib\TLibEncoder\AnnexBwrite.h" />
     166    <ClInclude Include="..\..\source\Lib\TLibEncoder\NALwrite.h" />
    160167    <ClInclude Include="..\..\source\Lib\TLibEncoder\SEIwrite.h" />
    161168    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncAdaptiveLoopFilter.h" />
    … …  
    163170    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncBinCoder.h" />
    164171    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncBinCoderCABAC.h" />
     172    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncBinCoderCABACCounter.h" />
    165173    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncCavlc.h" />
    166174    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncCfg.h" />
    167175    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncCu.h" />
    168176    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncEntropy.h" />
    169     <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncFormattedStringParser.h" />
    170177    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncGOP.h" />
     178    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncPic.h" />
     179    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncPreanalyzer.h" />
     180    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncSampleAdaptiveOffset.h" />
    171181    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncSbac.h" />
    172182    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncSearch.h" />
    173     <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncSeqStructure.h" />
    174183    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncSlice.h" />
    175184    <ClInclude Include="..\..\source\Lib\TLibEncoder\TEncTop.h" />

  • trunk/build/vc10/TLibRenderer_vc10.vcxproj

    r2 r56  
    9292      <WarningLevel>Level3</WarningLevel>
    9393      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     94      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9595    </ClCompile>
    9696  </ItemDefinitionGroup>
    … …  
    107107      <WarningLevel>Level3</WarningLevel>
    108108      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     109      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    110110    </ClCompile>
    111111  </ItemDefinitionGroup>
    … …  
    122122      <WarningLevel>Level3</WarningLevel>
    123123      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     124      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    124125    </ClCompile>
    125126  </ItemDefinitionGroup>
    … …  
    139140      <WarningLevel>Level3</WarningLevel>
    140141      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     142      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    141143    </ClCompile>
    142144  </ItemDefinitionGroup>
    … …  
    145147    <ClCompile Include="..\..\source\Lib\TLibRenderer\TRenImagePlane.cpp" />
    146148    <ClCompile Include="..\..\source\Lib\TLibRenderer\TRenImage.cpp" />
     149    <ClCompile Include="..\..\source\Lib\TLibRenderer\TRenInterpFilter.cpp" />
    147150    <ClCompile Include="..\..\source\Lib\TLibRenderer\TRenModel.cpp" />
    148151    <ClCompile Include="..\..\source\Lib\TLibRenderer\TRenModSetupStrParser.cpp" />
    … …  
    154157    <ClInclude Include="..\..\source\Lib\TLibRenderer\TRenImagePlane.h" />
    155158    <ClInclude Include="..\..\source\Lib\TLibRenderer\TRenImage.h" />
     159    <ClInclude Include="..\..\source\Lib\TLibRenderer\TRenInterpFilter.h" />
    156160    <ClInclude Include="..\..\source\Lib\TLibRenderer\TRenModel.h" />
    157161    <ClInclude Include="..\..\source\Lib\TLibRenderer\TRenModSetupStrParser.h" />

  • trunk/build/vc10/TLibVideoIO_vc10.vcxproj

    r2 r56  
    6161  <PropertyGroup Label="UserMacros" />
    6262  <PropertyGroup>
    63     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     63    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    6464    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6565    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
     66    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
     67    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    6668    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    6769    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    7070    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</OutDir>
    7171    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\vc10\$(Platform)\$(Configuration)\$(RootNamespace)\</IntDir>
    … …  
    8686    <ClCompile>
    8787      <Optimization>Disabled</Optimization>
     88      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8889      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8990      <MinimalRebuild>true</MinimalRebuild>
    … …  
    9293      <WarningLevel>Level3</WarningLevel>
    9394      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    94       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
     95    </ClCompile>
     96  </ItemDefinitionGroup>
     97  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     98    <Midl>
     99      <TargetEnvironment>X64</TargetEnvironment>
     100    </Midl>
     101    <ClCompile>
     102      <Optimization>Disabled</Optimization>
     103      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     104      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     105      <MinimalRebuild>true</MinimalRebuild>
     106      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     107      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     108      <WarningLevel>Level3</WarningLevel>
     109      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    95110    </ClCompile>
    96111  </ItemDefinitionGroup>
    … …  
    101116      <IntrinsicFunctions>false</IntrinsicFunctions>
    102117      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    103       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     119      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    104120      <StringPooling>true</StringPooling>
    105121      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    106122      <FunctionLevelLinking>true</FunctionLevelLinking>
    107       <WarningLevel>Level3</WarningLevel>
    108       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    109       <AdditionalIncludeDirectories>..\..\compat\msvc</AdditionalIncludeDirectories>
    110     </ClCompile>
    111   </ItemDefinitionGroup>
    112   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    113     <Midl>
    114       <TargetEnvironment>X64</TargetEnvironment>
    115     </Midl>
    116     <ClCompile>
    117       <Optimization>Disabled</Optimization>
    118       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119       <MinimalRebuild>true</MinimalRebuild>
    120       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    121       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    122123      <WarningLevel>Level3</WarningLevel>
    123124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    133134      <IntrinsicFunctions>false</IntrinsicFunctions>
    134135      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
    135       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     136      <AdditionalIncludeDirectories>$(SolutionDir)\..\source\Lib\;$(SolutionDir)\..\compat\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     137      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136138      <StringPooling>true</StringPooling>
    137139      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    … …  
    142144  </ItemDefinitionGroup>
    143145  <ItemGroup>
    144     <ClCompile Include="..\..\source\Lib\TLibVideoIO\TVideoIOBits.cpp" />
    145146    <ClCompile Include="..\..\source\Lib\TLibVideoIO\TVideoIOYuv.cpp" />
    146147  </ItemGroup>
    147148  <ItemGroup>
    148     <ClInclude Include="..\..\source\Lib\TLibVideoIO\TVideoIOBits.h" />
    149149    <ClInclude Include="..\..\source\Lib\TLibVideoIO\TVideoIOYuv.h" />
    150150  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.