diff options
| author | pieh <misiek.piechowiak@gmail.com> | 2011-08-18 11:45:10 -0700 |
|---|---|---|
| committer | pieh <misiek.piechowiak@gmail.com> | 2011-08-18 11:45:10 -0700 |
| commit | 55941ded3b0d68c45fd006d98075a93626742137 (patch) | |
| tree | c2af525ad235c2b5618d16c8d45ee6652cd8b241 /project | |
| parent | 125cb1e7e5e1ac3328b0da283d0f86e332668db1 (diff) | |
| parent | c29b990d4c3db4915ee5f2fc0096ee95465b96d7 (diff) | |
Merge pull request #352 from pieh/conditional_onX
Add optional condition attribute to <onfoo condition="bar">blah</onfoo>
Diffstat (limited to 'project')
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 3 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index a0d38b4c43..24f3ea6aee 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -360,6 +360,7 @@ <ClCompile Include="..\..\xbmc\guilib\DirtyRegionTracker.cpp" /> <ClCompile Include="..\..\xbmc\guilib\FrameBufferObject.cpp" /> <ClCompile Include="..\..\xbmc\guilib\GraphicContext.cpp" /> + <ClCompile Include="..\..\xbmc\guilib\GUIAction.cpp" /> <ClCompile Include="..\..\xbmc\guilib\GUIAudioManager.cpp" /> <ClCompile Include="..\..\xbmc\guilib\GUIBaseContainer.cpp" /> <ClCompile Include="..\..\xbmc\guilib\GUIBorderedImage.cpp" /> @@ -1268,7 +1269,7 @@ <ClInclude Include="..\..\xbmc\guilib\Geometry.h" /> <ClInclude Include="..\..\xbmc\guilib\GraphicContext.h" /> <ClInclude Include="..\..\xbmc\guilib\gui3d.h" /> - <ClInclude Include="..\..\xbmc\guilib\GUIActionDescriptor.h" /> + <ClInclude Include="..\..\xbmc\guilib\GUIAction.h" /> <ClInclude Include="..\..\xbmc\guilib\GUIAudioManager.h" /> <ClInclude Include="..\..\xbmc\guilib\GUIBaseContainer.h" /> <ClInclude Include="..\..\xbmc\guilib\GUIBorderedImage.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index c370592a28..3a377505f9 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -2490,6 +2490,9 @@ <ClCompile Include="..\..\xbmc\interfaces\info\InfoBool.cpp"> <Filter>interfaces\info</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\guilib\GUIAction.cpp"> + <Filter>guilib</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\xbmc\win32\pch.h"> @@ -3631,9 +3634,6 @@ <ClInclude Include="..\..\xbmc\guilib\gui3d.h"> <Filter>guilib</Filter> </ClInclude> - <ClInclude Include="..\..\xbmc\guilib\GUIActionDescriptor.h"> - <Filter>guilib</Filter> - </ClInclude> <ClInclude Include="..\..\xbmc\guilib\GUIAudioManager.h"> <Filter>guilib</Filter> </ClInclude> @@ -5003,6 +5003,9 @@ <ClInclude Include="..\..\xbmc\interfaces\info\InfoBool.h"> <Filter>interfaces\info</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\guilib\GUIAction.h"> + <Filter>guilib</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc"> |