[Sumover-dev] [svn commit] r4830 - in vic/branches/mpeg4:
render/mkbv
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Wed May 12 05:40:10 BST 2010
Author: douglask
Date: Wed May 12 05:40:10 2010
New Revision: 4830
Modified:
vic/branches/mpeg4/render/mkbv/mkbv.vcxproj
vic/branches/mpeg4/vic.sln
vic/branches/mpeg4/vic.vcxproj
vic/branches/mpeg4/vic.vcxproj.filters
vic/branches/mpeg4/vic.vcxproj.user
Log:
Few more VS 2010 fixes
Modified: vic/branches/mpeg4/render/mkbv/mkbv.vcxproj
==============================================================================
--- vic/branches/mpeg4/render/mkbv/mkbv.vcxproj (original)
+++ vic/branches/mpeg4/render/mkbv/mkbv.vcxproj Wed May 12 05:40:10 2010
@@ -59,6 +59,18 @@
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
+ <CustomBuildStep>
+ <Command>"$(OutDir)mkbv" > "$(OutDir)bv.c"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Generating "$(OutDir)bv.c"</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(OutDir)bv.c</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>mkbv.c</Inputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -80,6 +92,18 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
+ <CustomBuildStep>
+ <Command>"$(OutDir)mkbv" > "$(OutDir)bv.c"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Generating "$(OutDir)bv.c"</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(OutDir)bv.c</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>mkbv.c</Inputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="mkbv.c" />
Modified: vic/branches/mpeg4/vic.sln
==============================================================================
--- vic/branches/mpeg4/vic.sln (original)
+++ vic/branches/mpeg4/vic.sln Wed May 12 05:40:10 2010
@@ -19,8 +19,8 @@
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.ActiveCfg = Debug (GPL)|Win32
- {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.Build.0 = Debug (GPL)|Win32
+ {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.ActiveCfg = Debug (nonGPL)|Win32
+ {C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Debug|Win32.Build.0 = Debug (nonGPL)|Win32
{C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Release|Win32.ActiveCfg = Release (GPL)|Win32
{C4283F3F-6329-47C4-83DD-C5CE4EF7C8D0}.Release|Win32.Build.0 = Release (GPL)|Win32
{17CA0CE4-D1AD-4B74-B3EB-26E01E36FBC9}.Debug|Win32.ActiveCfg = Debug|Win32
Modified: vic/branches/mpeg4/vic.vcxproj
==============================================================================
--- vic/branches/mpeg4/vic.vcxproj (original)
+++ vic/branches/mpeg4/vic.vcxproj Wed May 12 05:40:10 2010
@@ -463,6 +463,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="render\color.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="render\renderer-window.cpp" />
<ClCompile Include="render\renderer.cpp" />
<ClCompile Include="render\rgb-converter.cpp" />
@@ -570,6 +574,7 @@
<OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Release (nonGPL)|Win32'">video</OutputDirectory>
<GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Release (nonGPL)|Win32'">false</GenerateTypeLibrary>
<GenerateTypeLibrary Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">false</GenerateTypeLibrary>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (GPL)|Win32'">true</ExcludedFromBuild>
</Midl>
</ItemGroup>
<PropertyGroup Label="Globals">
Modified: vic/branches/mpeg4/vic.vcxproj.filters
==============================================================================
--- vic/branches/mpeg4/vic.vcxproj.filters (original)
+++ vic/branches/mpeg4/vic.vcxproj.filters Wed May 12 05:40:10 2010
@@ -418,6 +418,9 @@
<ClCompile Include="video\DeckLinkAPI_i.c">
<Filter>video</Filter>
</ClCompile>
+ <ClCompile Include="render\color.cpp">
+ <Filter>render</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="codec\databuffer.h">
Modified: vic/branches/mpeg4/vic.vcxproj.user
==============================================================================
--- vic/branches/mpeg4/vic.vcxproj.user (original)
+++ vic/branches/mpeg4/vic.vcxproj.user Wed May 12 05:40:10 2010
@@ -4,4 +4,16 @@
<LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (nonGPL)|Win32'">
+ <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (GPL)|Win32'">
+ <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (nonGPL)|Win32'">
+ <LocalDebuggerCommandArguments>234.5.6.7/16000</LocalDebuggerCommandArguments>
+ <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+ </PropertyGroup>
</Project>
\ No newline at end of file
More information about the Sumover-dev
mailing list