[WIN32] Sync vs2010 with latest vs2008's changes

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

8 files changed, 25 insertions, 16 deletions

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 0ac602b54f..28894f7e24 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -269,6 +269,8 @@
   <ItemGroup>

     <ClCompile Include="..\..\xbmc\AddonDatabase.cpp" />

     <ClCompile Include="..\..\xbmc\addons\Repository.cpp" />

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

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

     <ClCompile Include="..\..\xbmc\GUIViewStateAddonBrowser.cpp" />

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

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

@@ -995,6 +997,8 @@
   <ItemGroup>

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

     <ClInclude Include="..\..\xbmc\addons\Repository.h" />

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

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

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

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

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

diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 844703be07..414ab4ad0a 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -2124,6 +2124,12 @@
     <ClCompile Include="..\..\xbmc\addons\Repository.cpp">

       <Filter>Source Files\Addons</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\xbmc\addons\Skin.cpp">

+      <Filter>Source Files\Addons</Filter>

+    </ClCompile>

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

+      <Filter>Source Files\GUI Dialog</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -4481,6 +4487,12 @@
     <ClInclude Include="..\..\xbmc\addons\Repository.h">

       <Filter>Source Files\Addons</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\xbmc\addons\Skin.h">

+      <Filter>Source Files\Addons</Filter>

+    </ClInclude>

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

+      <Filter>Source Files\GUI Dialog</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

diff --git a/project/VS2010Express/guilib.vcxproj b/project/VS2010Express/guilib.vcxproj
index 301e1bde23..8febbca8e0 100644
--- a/project/VS2010Express/guilib.vcxproj
+++ b/project/VS2010Express/guilib.vcxproj
@@ -263,7 +263,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">Create</PrecompiledHeader>

     </ClCompile>

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

-    <ClCompile Include="..\..\guilib\SkinInfo.cpp" />

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

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

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

@@ -408,7 +407,6 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">..\..\xbmc\win32\svn_rev.h;%(Outputs)</Outputs>

     </CustomBuild>

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

-    <ClInclude Include="..\..\guilib\SkinInfo.h" />

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

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

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

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\guilib\SkinInfo.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\guilib\TextureBundle.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -539,9 +536,6 @@
     <ClInclude Include="..\..\guilib\Shader.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\guilib\SkinInfo.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj b/xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj
index b985f1eee0..e8ecdd6929 100644
--- a/xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj
+++ b/xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj
@@ -80,6 +80,7 @@
       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

+      <IgnoreSpecificDefaultLibraries>LIBCMTD</IgnoreSpecificDefaultLibraries>

     </Link>

     <PostBuildEvent>

       <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\system\players\paplayer\$(TargetFileName)"</Command>

diff --git a/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
index f15b76ea54..7f380b7086 100644
--- a/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
+++ b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
@@ -79,7 +79,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.dxspectrum\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.dxspectrum\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">

@@ -108,7 +108,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.dxspectrum\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.dxspectrum\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/xbmc/visualizations/Milkdrop/Plugin.vcxproj b/xbmc/visualizations/Milkdrop/Plugin.vcxproj
index 7feeeda357..9362eacb6b 100644
--- a/xbmc/visualizations/Milkdrop/Plugin.vcxproj
+++ b/xbmc/visualizations/Milkdrop/Plugin.vcxproj
@@ -84,7 +84,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\com.nullsoft.milkdrop.xbmc\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.milkdrop\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -114,7 +114,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\com.nullsoft.milkdrop.xbmc\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.milkdrop\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/xbmc/visualizations/WaveForm/Waveform.vcxproj b/xbmc/visualizations/WaveForm/Waveform.vcxproj
index 9872480e6a..f11a8a10f2 100644
--- a/xbmc/visualizations/WaveForm/Waveform.vcxproj
+++ b/xbmc/visualizations/WaveForm/Waveform.vcxproj
@@ -110,7 +110,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.waveform\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.waveform\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">

@@ -137,7 +137,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.waveform\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.waveform\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">

@@ -165,7 +165,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.waveform\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.waveform\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (DirectX)|Win32'">

@@ -192,7 +192,7 @@
       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <PostBuildEvent>

-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\org.xbmc.addons.waveform\$(TargetFileName)"</Command>

+      <Command>copy "$(TargetPath)" "$(SolutionDir)..\..\addons\visualization.waveform\$(TargetFileName)"</Command>

     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>