Changeset 4830

Show
Ignore:
Timestamp:
05/12/10 05:40:10 (3 years ago)
Author:
douglask
Message:

Few more VS 2010 fixes

Location:
vic/branches/mpeg4
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • vic/branches/mpeg4/render/mkbv/mkbv.vcxproj

    r4828 r4830  
    6060      <GenerateDebugInformation>true</GenerateDebugInformation> 
    6161    </Link> 
     62    <CustomBuildStep> 
     63      <Command>"$(OutDir)mkbv" &gt; "$(OutDir)bv.c"</Command> 
     64    </CustomBuildStep> 
     65    <CustomBuildStep> 
     66      <Message>Generating "$(OutDir)bv.c"</Message> 
     67    </CustomBuildStep> 
     68    <CustomBuildStep> 
     69      <Outputs>$(OutDir)bv.c</Outputs> 
     70    </CustomBuildStep> 
     71    <CustomBuildStep> 
     72      <Inputs>mkbv.c</Inputs> 
     73    </CustomBuildStep> 
    6274  </ItemDefinitionGroup> 
    6375  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 
    … …  
    8193      <OptimizeReferences>true</OptimizeReferences> 
    8294    </Link> 
     95    <CustomBuildStep> 
     96      <Command>"$(OutDir)mkbv" &gt; "$(OutDir)bv.c"</Command> 
     97    </CustomBuildStep> 
     98    <CustomBuildStep> 
     99      <Message>Generating "$(OutDir)bv.c"</Message> 
     100    </CustomBuildStep> 
     101    <CustomBuildStep> 
     102      <Outputs>$(OutDir)bv.c</Outputs> 
     103    </CustomBuildStep> 
     104    <CustomBuildStep> 
     105      <Inputs>mkbv.c</Inputs> 
     106    </CustomBuildStep> 
    83107  </ItemDefinitionGroup> 
    84108  <ItemGroup> 

  • vic/branches/mpeg4/vic.sln

    r4818 r4830  
    2020        EndGlobalSection 
    2121        GlobalSection(ProjectConfigurationPlatforms) = postSolution 
    22                 {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.ActiveCfg = Debug (GPL)|Win32 
    23                 {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.Build.0 = Debug (GPL)|Win32 
     22                {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.ActiveCfg = Debug (nonGPL)|Win32 
     23                {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.Build.0 = Debug (nonGPL)|Win32 
    2424                {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Release|Win32.ActiveCfg = Release (GPL)|Win32 
    2525                {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Release|Win32.Build.0 = Release (GPL)|Win32 

  • vic/branches/mpeg4/vic.vcxproj

    r4820 r4830  
    461461    </ClCompile> 
    462462    <ClCompile Include="render\color-true.cpp"> 
     463      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild> 
     464      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">true</ExcludedFromBuild> 
     465    </ClCompile> 
     466    <ClCompile Include="render\color.cpp"> 
    463467      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild> 
    464468      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">true</ExcludedFromBuild> 
    … …  
    571575      <GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Release (nonGPL)|Win32'">false</GenerateTypeLibrary> 
    572576      <GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">false</GenerateTypeLibrary> 
     577      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild> 
    573578    </Midl> 
    574579  </ItemGroup> 

  • vic/branches/mpeg4/vic.vcxproj.filters

    r4820 r4830  
    418418    <ClCompile Include="video\DeckLinkAPI_i.c"> 
    419419      <Filter>video</Filter> 
     420    </ClCompile> 
     421    <ClCompile Include="render\color.cpp"> 
     422      <Filter>render</Filter> 
    420423    </ClCompile> 
    421424  </ItemGroup> 

  • vic/branches/mpeg4/vic.vcxproj.user

    r4818 r4830  
    55    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> 
    66  </PropertyGroup> 
     7  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (nonGPL)|Win32'"> 
     8    <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments> 
     9    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> 
     10  </PropertyGroup> 
     11  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'"> 
     12    <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments> 
     13    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> 
     14  </PropertyGroup> 
     15  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (nonGPL)|Win32'"> 
     16    <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments> 
     17    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> 
     18  </PropertyGroup> 
    719</Project>