[WIN32] sync VS2010 project with 31007, 31127 and 31151

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31160 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 16 insertions, 27 deletions

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index b55cccfd9a..483455293e 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -291,6 +291,7 @@
     <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AudioLibrary.cpp" />

     <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonAddon.cpp" />

     <ClCompile Include="..\..\xbmc\lib\libPython\xbmcmodule\xbmcaddonmodule.cpp" />

+    <ClCompile Include="..\..\xbmc\RenderSystemGLES.cpp" />

     <ClCompile Include="..\..\xbmc\win32\NetworkWin32.cpp" />

     <ClCompile Include="..\..\xbmc\win32\pch.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Create</PrecompiledHeader>

@@ -971,9 +972,6 @@
     <ClCompile Include="..\..\xbmc\cdrip\EncoderLame.cpp" />

     <ClCompile Include="..\..\xbmc\cdrip\EncoderVorbis.cpp" />

     <ClCompile Include="..\..\xbmc\cdrip\EncoderWav.cpp" />

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\AMFObject.cpp" />

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\rtmp.cpp" />

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\rtmppacket.cpp" />

     <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.cpp" />

     <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AVPlaylistOperations.cpp" />

     <ClCompile Include="..\..\xbmc\lib\libjsonrpc\FileItemHandler.cpp" />

@@ -1002,6 +1000,7 @@
     <ClInclude Include="..\..\xbmc\GUIViewStateAddonBrowser.h" />

     <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AudioLibrary.h" />

     <ClInclude Include="..\..\xbmc\lib\libPython\xbmcmodule\PythonAddon.h" />

+    <ClInclude Include="..\..\xbmc\RenderSystemGLES.h" />

     <ClInclude Include="..\..\xbmc\SystemGlobals.h" />

     <ClInclude Include="..\..\xbmc\win32\NetworkWin32.h" />

     <ClInclude Include="..\..\xbmc\win32\pch.h" />

@@ -1755,9 +1754,6 @@
     <ClInclude Include="..\..\xbmc\cdrip\EncoderLame.h" />

     <ClInclude Include="..\..\xbmc\cdrip\EncoderVorbis.h" />

     <ClInclude Include="..\..\xbmc\cdrip\EncoderWav.h" />

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\AMFObject.h" />

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\rtmp.h" />

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\rtmppacket.h" />

     <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.h" />

     <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AVPlaylistOperations.h" />

     <ClInclude Include="..\..\xbmc\lib\libjsonrpc\FileItemHandler.h" />

diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index e8ffdbe736..1a82c85b6d 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -175,9 +175,6 @@
     <Filter Include="libraries\cdrip">

       <UniqueIdentifier>{595eeac0-ead4-4c21-a22b-deffe179ba17}</UniqueIdentifier>

     </Filter>

-    <Filter Include="libraries\libRTMP">

-      <UniqueIdentifier>{f89ac5ca-72c0-4f4d-8654-ebfa9f0d0697}</UniqueIdentifier>

-    </Filter>

     <Filter Include="libraries\libjsonrpc">

       <UniqueIdentifier>{96910e2c-8b38-4c14-8baa-7c7280bd45cd}</UniqueIdentifier>

     </Filter>

@@ -2031,15 +2028,6 @@
     <ClCompile Include="..\..\xbmc\cdrip\EncoderWav.cpp">

       <Filter>libraries\cdrip</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\AMFObject.cpp">

-      <Filter>libraries\libRTMP</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\rtmp.cpp">

-      <Filter>libraries\libRTMP</Filter>

-    </ClCompile>

-    <ClCompile Include="..\..\xbmc\lib\libRTMP\rtmppacket.cpp">

-      <Filter>libraries\libRTMP</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.cpp">

       <Filter>libraries\libjsonrpc</Filter>

     </ClCompile>

@@ -2127,6 +2115,9 @@
     <ClCompile Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\CrystalHD.cpp">

       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\xbmc\RenderSystemGLES.cpp">

+      <Filter>Source Files\Windowing\Render System</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\xbmc\win32\NetworkWin32.h">

@@ -4379,15 +4370,6 @@
     <ClInclude Include="..\..\xbmc\cdrip\EncoderWav.h">

       <Filter>libraries\cdrip</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\AMFObject.h">

-      <Filter>libraries\libRTMP</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\rtmp.h">

-      <Filter>libraries\libRTMP</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\xbmc\lib\libRTMP\rtmppacket.h">

-      <Filter>libraries\libRTMP</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\xbmc\lib\libjsonrpc\AVPlayerOperations.h">

       <Filter>libraries\libjsonrpc</Filter>

     </ClInclude>

@@ -4472,6 +4454,9 @@
     <ClInclude Include="..\..\xbmc\cores\dvdplayer\DVDCodecs\Video\CrystalHD.h">

       <Filter>cores\dvdplayer\DVDCodecs\Video</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\xbmc\RenderSystemGLES.h">

+      <Filter>Source Files\Windowing\Render System</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\..\xbmc\win32\XBMC.ico">

diff --git a/project/VS2010Express/guilib.vcxproj b/project/VS2010Express/guilib.vcxproj
index d328b6ad85..67a9defa85 100644
--- a/project/VS2010Express/guilib.vcxproj
+++ b/project/VS2010Express/guilib.vcxproj
@@ -251,6 +251,7 @@
     <ClCompile Include="..\..\guilib\GUIStaticItem.cpp" />

     <ClCompile Include="..\..\guilib\GUITextBox.cpp" />

     <ClCompile Include="..\..\guilib\GUITextLayout.cpp" />

+    <ClCompile Include="..\..\guilib\GUITextureGLES.cpp" />

     <ClCompile Include="..\..\guilib\GUIToggleButtonControl.cpp" />

     <ClCompile Include="..\..\guilib\GUIVideoControl.cpp" />

     <ClCompile Include="..\..\guilib\GUIVisualisationControl.cpp" />

@@ -332,6 +333,7 @@
   <ItemGroup>

     <ClInclude Include="..\..\guilib\D3DResource.h" />

     <ClInclude Include="..\..\guilib\GUIRenderingControl.h" />

+    <ClInclude Include="..\..\guilib\GUITextureGLES.h" />

     <ClInclude Include="..\..\guilib\TextureBundleXBT.h" />

     <ClInclude Include="..\..\guilib\TextureBundleXPR.h" />

     <ClInclude Include="..\..\guilib\XBTF.h" />

diff --git a/project/VS2010Express/guilib.vcxproj.filters b/project/VS2010Express/guilib.vcxproj.filters
index 65b0e088d9..aaebf8be4e 100644
--- a/project/VS2010Express/guilib.vcxproj.filters
+++ b/project/VS2010Express/guilib.vcxproj.filters
@@ -309,6 +309,9 @@
     <ClCompile Include="..\..\guilib\TextureGL.cpp">

       <Filter>Rendering\GL</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\guilib\GUITextureGLES.cpp">

+      <Filter>Rendering\GL</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\guilib\D3DResource.h">

@@ -605,6 +608,9 @@
     <ClInclude Include="..\..\guilib\TextureGL.h">

       <Filter>Rendering\GL</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\guilib\GUITextureGLES.h">

+      <Filter>Rendering\GL</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <CustomBuild Include="..\..\xbmc\win32\PlatformInclude.h">