Merge pull request #3528 from Karlson2k/win32_projects_update_02

[win32] mark debug/release configs with proper internal marks

diff --cc lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj
Simple merge

diff --cc lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj
Simple merge

diff --cc lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
Simple merge

diff --cc lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj
Simple merge

diff --cc lib/cmyth/Win32/libcmyth.vcxproj
Simple merge

diff --cc lib/cximage-6.0/ImageLib.vcxproj
index cb2f39a,1181839..7f4573b
--- 1/lib/cximage-6.0/ImageLib.vcxproj
--- 2/lib/cximage-6.0/ImageLib.vcxproj
+++ b/lib/cximage-6.0/ImageLib.vcxproj
@@@ -15,14 -23,24 +15,16 @@@
      <ProjectGuid>{3B424C94-2005-44CC-BFB1-4B6C89090732}</ProjectGuid>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>DynamicLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>DynamicLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
    </ImportGroup>

diff --cc lib/cximage-6.0/jasper/jasper.vcxproj
index 8d4b247,2f4ef95..c40a1d0
--- 1/lib/cximage-6.0/jasper/jasper.vcxproj
--- 2/lib/cximage-6.0/jasper/jasper.vcxproj
+++ b/lib/cximage-6.0/jasper/jasper.vcxproj
@@@ -15,14 -27,30 +15,16 @@@
      <ProjectGuid>{3843C3D4-E5A6-4030-87EC-E7EE57242106}</ProjectGuid>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <UseOfMfc>false</UseOfMfc>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <UseOfMfc>false</UseOfMfc>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
      <UseOfMfc>false</UseOfMfc>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
      <UseOfMfc>false</UseOfMfc>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <UseOfMfc>false</UseOfMfc>
 -  </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
    </ImportGroup>

diff --cc lib/cximage-6.0/jbig/jbig.vcxproj
index 68d06f6,52d52bf..8f884d5
--- 1/lib/cximage-6.0/jbig/jbig.vcxproj
--- 2/lib/cximage-6.0/jbig/jbig.vcxproj
+++ b/lib/cximage-6.0/jbig/jbig.vcxproj
@@@ -15,11 -23,21 +15,13 @@@
      <ProjectGuid>{88E7E431-3752-4D58-BCD2-A7E6A1B74247}</ProjectGuid>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">

diff --cc lib/cximage-6.0/jpeg/Jpeg.vcxproj
index ecec231,d9c87af..08f4b1a
--- 1/lib/cximage-6.0/jpeg/Jpeg.vcxproj
--- 2/lib/cximage-6.0/jpeg/Jpeg.vcxproj
+++ b/lib/cximage-6.0/jpeg/Jpeg.vcxproj
@@@ -21,7 -30,16 +22,8 @@@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
    </ImportGroup>

diff --cc lib/cximage-6.0/mng/mng.vcxproj
index 56d585d,a3b1d90..11c1c56
--- 1/lib/cximage-6.0/mng/mng.vcxproj
--- 2/lib/cximage-6.0/mng/mng.vcxproj
+++ b/lib/cximage-6.0/mng/mng.vcxproj
@@@ -18,9 -26,19 +18,11 @@@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">

diff --cc lib/cximage-6.0/png/png.vcxproj
index 02543b6,69bdc20..70e9054
--- 1/lib/cximage-6.0/png/png.vcxproj
--- 2/lib/cximage-6.0/png/png.vcxproj
+++ b/lib/cximage-6.0/png/png.vcxproj
@@@ -16,11 -24,21 +16,13 @@@
      <Keyword>MFCProj</Keyword>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">

diff --cc lib/cximage-6.0/raw/libdcr.vcxproj
index ada0f02,e571908..e5e21fd
--- 1/lib/cximage-6.0/raw/libdcr.vcxproj
--- 2/lib/cximage-6.0/raw/libdcr.vcxproj
+++ b/lib/cximage-6.0/raw/libdcr.vcxproj
@@@ -15,8 -23,17 +15,9 @@@
      <ProjectGuid>{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}</ProjectGuid>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>

diff --cc lib/cximage-6.0/tiff/Tiff.vcxproj
index 355f880,d4bcfec..66fb54e
--- 1/lib/cximage-6.0/tiff/Tiff.vcxproj
--- 2/lib/cximage-6.0/tiff/Tiff.vcxproj
+++ b/lib/cximage-6.0/tiff/Tiff.vcxproj
@@@ -16,8 -24,17 +16,9 @@@
      <Keyword>MFCProj</Keyword>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>

diff --cc lib/cximage-6.0/zlib/zlib.vcxproj
index 5780a41,d9be20e..58a48b1
--- 1/lib/cximage-6.0/zlib/zlib.vcxproj
--- 2/lib/cximage-6.0/zlib/zlib.vcxproj
+++ b/lib/cximage-6.0/zlib/zlib.vcxproj
@@@ -22,7 -31,16 +23,8 @@@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
 -    <ConfigurationType>StaticLibrary</ConfigurationType>
 -    <CharacterSet>Unicode</CharacterSet>
 -  </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <ImportGroup Label="ExtensionSettings">
    </ImportGroup>

diff --cc lib/libRTV/libRTV.vcxproj
index 7c633da,f5c4dc5..1e69337
--- 1/lib/libRTV/libRTV.vcxproj
--- 2/lib/libRTV/libRTV.vcxproj
+++ b/lib/libRTV/libRTV.vcxproj
@@@ -15,12 -27,27 +15,14 @@@
      <Keyword>XboxProj</Keyword>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Win32'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <CharacterSet>MultiByte</CharacterSet>
 -    <WholeProgramOptimization>true</WholeProgramOptimization>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Win32'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
      <ConfigurationType>StaticLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --cc lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcxproj
Simple merge

diff --cc lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
Simple merge

diff --cc lib/libexif/libexif.vcxproj
index 707f5af,af9c2e5..09204bc
--- 1/lib/libexif/libexif.vcxproj
--- 2/lib/libexif/libexif.vcxproj
+++ b/lib/libexif/libexif.vcxproj
@@@ -19,10 -23,16 +19,12 @@@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (DLL)|Win32'" Label="Configuration">
      <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <UseDebugLibraries>false</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 -    <ConfigurationType>DynamicLibrary</ConfigurationType>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (DLL)|Win32'" Label="Configuration">
      <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <UseDebugLibraries>true</UseDebugLibraries>
      <CharacterSet>MultiByte</CharacterSet>
    </PropertyGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --cc lib/libmad/msvc++/libmad.vcxproj
Simple merge

diff --cc lib/libmodplug/libmodplug_2010.vcxproj
Simple merge

diff --cc lib/libsidplay2/libsidplay/win/VC/libsidplay.vcxproj
Simple merge

diff --cc lib/libsquish/vs7/squish/squish_2010.vcxproj
Simple merge

diff --cc lib/nosefart/NoseFartXBMC.vcxproj
Simple merge

diff --cc lib/stsound/StSoundLibrary/StSoundLibrary.vcxproj
Simple merge

diff --cc lib/vgmstream/win32/win32.vcxproj
Simple merge

diff --cc lib/xbadpcm/adpcm.vcxproj
Simple merge

diff --cc project/VS2010Express/UnrarXLib.vcxproj
Simple merge

diff --cc project/VS2010Express/XBMC.vcxproj
Simple merge

diff --cc project/VS2010Express/XbmcCommons.vcxproj
Simple merge

diff --cc project/VS2010Express/XbmcThreads.vcxproj
Simple merge

diff --cc project/VS2010Express/libPlatinum.vcxproj
Simple merge

diff --cc xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
Simple merge

diff --cc xbmc/visualizations/Milkdrop/Plugin.vcxproj
Simple merge

diff --cc xbmc/visualizations/WaveForm/Waveform.vcxproj
Simple merge