[OMPT-svn-commit] SF.net SVN: modplug:[3056] trunk/OpenMPT

[<man...@us...>]

Revision: 3056
          http://sourceforge.net/p/modplug/code/3056
Author:   manxorist
Date:     2013-10-27 05:40:49 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
[Var] Make premake4 proejct configuration names more consistent with default MSVC project configuration names.

Modified Paths:
--------------
    trunk/OpenMPT/include/flac/flac.vcproj
    trunk/OpenMPT/include/flac/flac.vcxproj
    trunk/OpenMPT/include/flac/flac.vcxproj.filters
    trunk/OpenMPT/include/lhasa/lhasa.vcproj
    trunk/OpenMPT/include/lhasa/lhasa.vcxproj
    trunk/OpenMPT/include/lhasa/lhasa.vcxproj.filters
    trunk/OpenMPT/include/miniz/miniz.vcproj
    trunk/OpenMPT/include/miniz/miniz.vcxproj
    trunk/OpenMPT/include/portaudio/portaudio.vcproj
    trunk/OpenMPT/include/portaudio/portaudio.vcxproj
    trunk/OpenMPT/include/portaudio/portaudio.vcxproj.filters
    trunk/OpenMPT/include/portmidi/portmidi.vcproj
    trunk/OpenMPT/include/portmidi/portmidi.vcxproj
    trunk/OpenMPT/include/portmidi/portmidi.vcxproj.filters
    trunk/OpenMPT/include/premake4-defaults.lua
    trunk/OpenMPT/include/premake4.lua
    trunk/OpenMPT/include/smbPitchShift/smbPitchShift.vcproj
    trunk/OpenMPT/include/smbPitchShift/smbPitchShift.vcxproj
    trunk/OpenMPT/include/soundtouch/soundtouch.vcproj
    trunk/OpenMPT/include/soundtouch/soundtouch.vcxproj
    trunk/OpenMPT/include/unrar/UnRAR.vcproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj
    trunk/OpenMPT/include/zlib/minizip.vcproj
    trunk/OpenMPT/include/zlib/minizip.vcxproj
    trunk/OpenMPT/include/zlib/minizip.vcxproj.filters
    trunk/OpenMPT/include/zlib/zlib.vcproj
    trunk/OpenMPT/include/zlib/zlib.vcxproj
    trunk/OpenMPT/mptrack/MPTRACK_08.sln
    trunk/OpenMPT/mptrack/MPTRACK_10.sln

Added Paths:
-----------
    trunk/OpenMPT/include/premake4-defaults-DLL.lua

Modified: trunk/OpenMPT/include/flac/flac.vcproj
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/flac/flac.vcproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -19,9 +19,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DebugLib|Win32"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x32\DebugLib"
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -97,9 +97,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugLib|x64"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x64\DebugLib"
+			Name="Debug|x64"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -176,9 +176,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|Win32"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x32\NormalLib"
+			Name="Normal|Win32"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x32\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -254,9 +254,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|x64"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x64\NormalLib"
+			Name="Normal|x64"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x64\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -333,9 +333,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|Win32"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x32\ReleaseLib"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -411,9 +411,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|x64"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x64\ReleaseLib"
+			Name="Release|x64"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>

Modified: trunk/OpenMPT/include/flac/flac.vcxproj
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcxproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/flac/flac.vcxproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="DebugLib|Win32">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="DebugLib|x64">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|Win32">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|Win32">
+			<Configuration>Normal</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|x64">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|x64">
+			<Configuration>Normal</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|Win32">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|Win32">
+			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|x64">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|x64">
+			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
 	</ItemGroup>
@@ -32,35 +32,35 @@
 		<Keyword>Win32Proj</Keyword>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,47 +69,47 @@
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 	<ImportGroup Label="ExtensionSettings">
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">obj\x32\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">obj\x64\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">flac64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">obj\x32\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">obj\x64\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">flac64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">obj\x32\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">obj\x64\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">flac64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\x32\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\x64\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\x32\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\x64\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">flac64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\x32\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\x64\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac64</TargetName>
 	</PropertyGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
@@ -137,7 +137,7 @@
 			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
@@ -165,7 +165,7 @@
 			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -196,7 +196,7 @@
 			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -227,7 +227,7 @@
 			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -258,7 +258,7 @@
 			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
 			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>

Modified: trunk/OpenMPT/include/flac/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcxproj.filters	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/flac/flac.vcxproj.filters	2013-10-27 05:40:49 UTC (rev 3056)
@@ -2,25 +2,25 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="src">
-			<UniqueIdentifier>{BBF2D14A-8E59-A544-9020-5934856C6448}</UniqueIdentifier>
+			<UniqueIdentifier>{C7DF4DA4-81D6-C14C-8755-F9F64D5469F8}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\libFLAC">
-			<UniqueIdentifier>{D099BA2E-71AE-E749-9790-2E15124CFA84}</UniqueIdentifier>
+			<UniqueIdentifier>{18BBCF5D-DA3A-384A-8346-98F0C474457F}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\libFLAC\include">
-			<UniqueIdentifier>{7BAE1380-58B5-F84A-84D3-435738E5A493}</UniqueIdentifier>
+			<UniqueIdentifier>{236E0FCD-E5F3-8F4B-B347-269E6B84A0D3}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\libFLAC\include\private">
-			<UniqueIdentifier>{CD4927A6-4150-534C-A102-B7BEA298EB87}</UniqueIdentifier>
+			<UniqueIdentifier>{B61606EA-324C-1444-9095-1A0C8DFA0454}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\libFLAC\include\protected">
-			<UniqueIdentifier>{404C67D4-91D9-DD40-A9CA-655744FEB544}</UniqueIdentifier>
+			<UniqueIdentifier>{5362FF1D-ACAA-0B49-B0A8-B6888135580B}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include">
-			<UniqueIdentifier>{D0B2E3C1-5592-6F4B-A6C8-B76AFC874957}</UniqueIdentifier>
+			<UniqueIdentifier>{1AD6DE94-BBD9-2D46-8047-02AE7ADDC671}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\FLAC">
-			<UniqueIdentifier>{EA0AFA08-1C54-3A49-B735-1CB0686E3C39}</UniqueIdentifier>
+			<UniqueIdentifier>{BB586A5B-E0AE-3B44-AEF2-7F5D54961ACB}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/include/lhasa/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/include/lhasa/lhasa.vcproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/lhasa/lhasa.vcproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -19,9 +19,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DebugLib|Win32"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x32\DebugLib"
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -96,9 +96,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugLib|x64"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x64\DebugLib"
+			Name="Debug|x64"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -174,9 +174,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|Win32"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x32\NormalLib"
+			Name="Normal|Win32"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x32\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -252,9 +252,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|x64"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x64\NormalLib"
+			Name="Normal|x64"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x64\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -331,9 +331,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|Win32"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x32\ReleaseLib"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -409,9 +409,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|x64"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x64\ReleaseLib"
+			Name="Release|x64"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>

Modified: trunk/OpenMPT/include/lhasa/lhasa.vcxproj
===================================================================
--- trunk/OpenMPT/include/lhasa/lhasa.vcxproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/lhasa/lhasa.vcxproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="DebugLib|Win32">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="DebugLib|x64">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|Win32">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|Win32">
+			<Configuration>Normal</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|x64">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|x64">
+			<Configuration>Normal</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|Win32">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|Win32">
+			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|x64">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|x64">
+			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
 	</ItemGroup>
@@ -32,35 +32,35 @@
 		<Keyword>Win32Proj</Keyword>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,47 +69,47 @@
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 	<ImportGroup Label="ExtensionSettings">
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">obj\x32\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">obj\x64\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">lhasa64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">obj\x32\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">obj\x64\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">lhasa64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">obj\x32\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">obj\x64\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">lhasa64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\x32\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\x64\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\x32\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\x64\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">lhasa64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\x32\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\x64\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa64</TargetName>
 	</PropertyGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<AdditionalIncludeDirectories>..\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -136,7 +136,7 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<AdditionalIncludeDirectories>..\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -163,7 +163,7 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -194,7 +194,7 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -225,7 +225,7 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -256,7 +256,7 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>

Modified: trunk/OpenMPT/include/lhasa/lhasa.vcxproj.filters
===================================================================
--- trunk/OpenMPT/include/lhasa/lhasa.vcxproj.filters	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/lhasa/lhasa.vcxproj.filters	2013-10-27 05:40:49 UTC (rev 3056)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="lib">
-			<UniqueIdentifier>{BA7B7B3E-39BD-6C43-A051-09B90A2BC6B2}</UniqueIdentifier>
+			<UniqueIdentifier>{38F33F4A-5E34-D840-91F3-0A051C465BE7}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="lib\public">
-			<UniqueIdentifier>{9EA20ABF-00C3-8F4B-83BE-B63F8048F920}</UniqueIdentifier>
+			<UniqueIdentifier>{235E9D2C-9DD3-604F-B197-5B60E50B272A}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/include/miniz/miniz.vcproj
===================================================================
--- trunk/OpenMPT/include/miniz/miniz.vcproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/miniz/miniz.vcproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -19,9 +19,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DebugLib|Win32"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x32\DebugLib"
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -94,9 +94,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugLib|x64"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x64\DebugLib"
+			Name="Debug|x64"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -170,9 +170,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|Win32"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x32\NormalLib"
+			Name="Normal|Win32"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x32\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -246,9 +246,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|x64"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x64\NormalLib"
+			Name="Normal|x64"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x64\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -323,9 +323,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|Win32"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x32\ReleaseLib"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -399,9 +399,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|x64"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x64\ReleaseLib"
+			Name="Release|x64"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>

Modified: trunk/OpenMPT/include/miniz/miniz.vcxproj
===================================================================
--- trunk/OpenMPT/include/miniz/miniz.vcxproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/miniz/miniz.vcxproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="DebugLib|Win32">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="DebugLib|x64">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|Win32">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|Win32">
+			<Configuration>Normal</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|x64">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|x64">
+			<Configuration>Normal</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|Win32">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|Win32">
+			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|x64">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|x64">
+			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
 	</ItemGroup>
@@ -32,35 +32,35 @@
 		<Keyword>Win32Proj</Keyword>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,47 +69,47 @@
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 	<ImportGroup Label="ExtensionSettings">
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">obj\x32\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">obj\x64\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">miniz64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">obj\x32\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">..\bin\NormalLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">obj\x64\NormalLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">miniz64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">obj\x32\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">..\bin\ReleaseLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">obj\x64\ReleaseLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">miniz64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\x32\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\x64\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\x32\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\x64\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">miniz64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\x32\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\x64\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz64</TargetName>
 	</PropertyGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -134,7 +134,7 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<ClCompile>
 			<Optimization>Disabled</Optimization>
 			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,7 +159,7 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -188,7 +188,7 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
 		<ClCompile>
 			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -217,7 +217,7 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
@@ -246,7 +246,7 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
 			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>

Modified: trunk/OpenMPT/include/portaudio/portaudio.vcproj
===================================================================
--- trunk/OpenMPT/include/portaudio/portaudio.vcproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/portaudio/portaudio.vcproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -19,9 +19,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DebugLib|Win32"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x32\DebugLib"
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -97,9 +97,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugLib|x64"
-			OutputDirectory="..\bin\DebugLib"
-			IntermediateDirectory="obj\x64\DebugLib"
+			Name="Debug|x64"
+			OutputDirectory="..\bin\Debug"
+			IntermediateDirectory="obj\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -176,9 +176,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|Win32"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x32\NormalLib"
+			Name="Normal|Win32"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x32\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -254,9 +254,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="NormalLib|x64"
-			OutputDirectory="..\bin\NormalLib"
-			IntermediateDirectory="obj\x64\NormalLib"
+			Name="Normal|x64"
+			OutputDirectory="..\bin\Normal"
+			IntermediateDirectory="obj\x64\Normal"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -333,9 +333,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|Win32"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x32\ReleaseLib"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -411,9 +411,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseLib|x64"
-			OutputDirectory="..\bin\ReleaseLib"
-			IntermediateDirectory="obj\x64\ReleaseLib"
+			Name="Release|x64"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory="obj\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>

Modified: trunk/OpenMPT/include/portaudio/portaudio.vcxproj
===================================================================
--- trunk/OpenMPT/include/portaudio/portaudio.vcxproj	2013-10-27 00:22:11 UTC (rev 3055)
+++ trunk/OpenMPT/include/portaudio/portaudio.vcxproj	2013-10-27 05:40:49 UTC (rev 3056)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="DebugLib|Win32">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|Win32">
+			<Configuration>Debug</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="DebugLib|x64">
-			<Configuration>DebugLib</Configuration>
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|Win32">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|Win32">
+			<Configuration>Normal</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="NormalLib|x64">
-			<Configuration>NormalLib</Configuration>
+		<ProjectConfiguration Include="Normal|x64">
+			<Configuration>Normal</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|Win32">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|Win32">
+			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="ReleaseLib|x64">
-			<Configuration>ReleaseLib</Configuration>
+		<ProjectConfiguration Include="Release|x64">
+			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
 	</ItemGroup>
@@ -32,35 +32,35 @@
 		<Keyword>Win32Proj</Keyword>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,47 +69,47 @@
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 	<ImportGroup Label="ExtensionSettings">
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 	</ImportGroup>
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">obj\x32\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">portaudio</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">..\bin\DebugLib\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">obj\x64\DebugLib\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">portaudio64</TargetName>
-		<OutDir Condition="'$(Configuration...
 
[truncated message content]