modplug-svn-commit

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

[<sag...@us...>]

Revision: 3044
          http://sourceforge.net/p/modplug/code/3044
Author:   saga-games
Date:     2013-10-26 16:37:16 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
[Mod] Rewrote RAR support using official unrar library. This adds support for newer RAR files (probably anything > RAR 1.5?).
All changes to the unrar code have been marked in the source code.
Solution file still needs to be updated for VS2008.

Modified Paths:
--------------
    trunk/OpenMPT/include/unrar/UnRAR.vcproj
    trunk/OpenMPT/include/unrar/arcread.cpp
    trunk/OpenMPT/include/unrar/extract.cpp
    trunk/OpenMPT/include/unrar/filcreat.cpp
    trunk/OpenMPT/include/unrar/file.cpp
    trunk/OpenMPT/include/unrar/file.hpp
    trunk/OpenMPT/include/unrar/filefn.cpp
    trunk/OpenMPT/include/unrar/find.cpp
    trunk/OpenMPT/include/unrar/match.cpp
    trunk/OpenMPT/include/unrar/pathfn.cpp
    trunk/OpenMPT/include/unrar/rar.hpp
    trunk/OpenMPT/include/unrar/rdwrfn.cpp
    trunk/OpenMPT/include/unrar/secpassword.cpp
    trunk/OpenMPT/include/unrar/volume.cpp
    trunk/OpenMPT/include/unrar/win32acl.cpp
    trunk/OpenMPT/include/unrar/win32lnk.cpp
    trunk/OpenMPT/mptrack/MPTRACK_10.sln
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
    trunk/OpenMPT/packageTemplate/readme.txt
    trunk/OpenMPT/unarchiver/unarchiver.cpp
    trunk/OpenMPT/unarchiver/unarchiver.h
    trunk/OpenMPT/unarchiver/unrar.cpp
    trunk/OpenMPT/unarchiver/unrar.h

Added Paths:
-----------
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
    trunk/OpenMPT/include/unrar/openmpt.hpp
    trunk/OpenMPT/include/unrar/openmpt.txt

Removed Paths:
-------------
    trunk/OpenMPT/unarchiver/unrar/

Property Changed:
----------------
    trunk/OpenMPT/include/unrar/

Index: trunk/OpenMPT/include/unrar
===================================================================
--- trunk/OpenMPT/include/unrar	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar	2013-10-26 16:37:16 UTC (rev 3044)

Property changes on: trunk/OpenMPT/include/unrar
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
+*.user
 build
Modified: trunk/OpenMPT/include/unrar/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcproj	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcproj	2013-10-26 16:37:16 UTC (rev 3044)
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				PreprocessorDefinitions="UNRAR"
+				PreprocessorDefinitions="MODPLUG_TRACKER"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -123,7 +123,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				PreprocessorDefinitions="UNRAR"
+				PreprocessorDefinitions="MODPLUG_TRACKER"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -205,7 +205,7 @@
 				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				PreprocessorDefinitions="UNRAR"
+				PreprocessorDefinitions="MODPLUG_TRACKER"
 				MinimalRebuild="false"
 				RuntimeLibrary="0"
 				StructMemberAlignment="0"
@@ -295,7 +295,7 @@
 				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				PreprocessorDefinitions="UNRAR"
+				PreprocessorDefinitions="MODPLUG_TRACKER"
 				StringPooling="false"
 				MinimalRebuild="false"
 				RuntimeLibrary="0"

Added: trunk/OpenMPT/include/unrar/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcxproj	                        (rev 0)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcxproj	2013-10-26 16:37:16 UTC (rev 3044)
@@ -0,0 +1,331 @@
+<?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="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
+    <RootNamespace>UnRAR</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <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)'=='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)'=='Release|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)'=='Debug|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.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\unrar32\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\unrar32\$(Configuration)\obj\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\unrar64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\unrar64\$(Configuration)\obj\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\unrar32\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\unrar32\$(Configuration)\obj\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\unrar64\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\unrar64\$(Configuration)\obj\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>UNRAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <PreprocessorDefinitions>MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <StructMemberAlignment>Default</StructMemberAlignment>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MinSpace</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <PreprocessorDefinitions>UNRAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>false</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="archive.cpp" />
+    <ClCompile Include="arcread.cpp" />
+    <ClCompile Include="blake2s.cpp" />
+    <ClCompile Include="cmddata.cpp" />
+    <ClCompile Include="consio.cpp" />
+    <ClCompile Include="crc.cpp" />
+    <ClCompile Include="crypt.cpp" />
+    <ClCompile Include="encname.cpp" />
+    <ClCompile Include="errhnd.cpp" />
+    <ClCompile Include="extinfo.cpp" />
+    <ClCompile Include="extract.cpp" />
+    <ClCompile Include="filcreat.cpp" />
+    <ClCompile Include="file.cpp" />
+    <ClCompile Include="filefn.cpp" />
+    <ClCompile Include="filestr.cpp" />
+    <ClCompile Include="find.cpp" />
+    <ClCompile Include="getbits.cpp" />
+    <ClCompile Include="global.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="hash.cpp" />
+    <ClCompile Include="headers.cpp" />
+    <ClCompile Include="isnt.cpp" />
+    <ClCompile Include="list.cpp" />
+    <ClCompile Include="match.cpp" />
+    <ClCompile Include="options.cpp" />
+    <ClCompile Include="pathfn.cpp" />
+    <ClCompile Include="qopen.cpp" />
+    <ClCompile Include="rar.cpp" />
+    <ClCompile Include="rarpch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="rarvm.cpp" />
+    <ClCompile Include="rawread.cpp" />
+    <ClCompile Include="rdwrfn.cpp" />
+    <ClCompile Include="recvol.cpp" />
+    <ClCompile Include="resource.cpp" />
+    <ClCompile Include="rijndael.cpp" />
+    <ClCompile Include="rs.cpp" />
+    <ClCompile Include="rs16.cpp" />
+    <ClCompile Include="scantree.cpp" />
+    <ClCompile Include="secpassword.cpp" />
+    <ClCompile Include="sha1.cpp" />
+    <ClCompile Include="sha256.cpp" />
+    <ClCompile Include="smallfn.cpp" />
+    <ClCompile Include="strfn.cpp" />
+    <ClCompile Include="strlist.cpp" />
+    <ClCompile Include="system.cpp" />
+    <ClCompile Include="threadpool.cpp" />
+    <ClCompile Include="timefn.cpp" />
+    <ClCompile Include="unicode.cpp" />
+    <ClCompile Include="unpack.cpp" />
+    <ClCompile Include="volume.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="archive.hpp" />
+    <ClInclude Include="array.hpp" />
+    <ClInclude Include="blake2s.hpp" />
+    <ClInclude Include="cmddata.hpp" />
+    <ClInclude Include="coder.hpp" />
+    <ClInclude Include="compress.hpp" />
+    <ClInclude Include="consio.hpp" />
+    <ClInclude Include="crc.hpp" />
+    <ClInclude Include="crypt.hpp" />
+    <ClInclude Include="dll.hpp" />
+    <ClInclude Include="encname.hpp" />
+    <ClInclude Include="errhnd.hpp" />
+    <ClInclude Include="extinfo.hpp" />
+    <ClInclude Include="extract.hpp" />
+    <ClInclude Include="filcreat.hpp" />
+    <ClInclude Include="file.hpp" />
+    <ClInclude Include="filefn.hpp" />
+    <ClInclude Include="filestr.hpp" />
+    <ClInclude Include="find.hpp" />
+    <ClInclude Include="getbits.hpp" />
+    <ClInclude Include="global.hpp" />
+    <ClInclude Include="hash.hpp" />
+    <ClInclude Include="headers.hpp" />
+    <ClInclude Include="headers5.hpp" />
+    <ClInclude Include="isnt.hpp" />
+    <ClInclude Include="list.hpp" />
+    <ClInclude Include="loclang.hpp" />
+    <ClInclude Include="log.hpp" />
+    <ClInclude Include="match.hpp" />
+    <ClInclude Include="model.hpp" />
+    <ClInclude Include="openmpt.hpp" />
+    <ClInclude Include="options.hpp" />
+    <ClInclude Include="os.hpp" />
+    <ClInclude Include="pathfn.hpp" />
+    <ClInclude Include="qopen.hpp" />
+    <ClInclude Include="rar.hpp" />
+    <ClInclude Include="rardefs.hpp" />
+    <ClInclude Include="rarlang.hpp" />
+    <ClInclude Include="raros.hpp" />
+    <ClInclude Include="rartypes.hpp" />
+    <ClInclude Include="rarvm.hpp" />
+    <ClInclude Include="rawread.hpp" />
+    <ClInclude Include="rdwrfn.hpp" />
+    <ClInclude Include="recvol.hpp" />
+    <ClInclude Include="resource.hpp" />
+    <ClInclude Include="rijndael.hpp" />
+    <ClInclude Include="rs.hpp" />
+    <ClInclude Include="rs16.hpp" />
+    <ClInclude Include="savepos.hpp" />
+    <ClInclude Include="scantree.hpp" />
+    <ClInclude Include="secpassword.hpp" />
+    <ClInclude Include="sha1.hpp" />
+    <ClInclude Include="sha256.hpp" />
+    <ClInclude Include="smallfn.hpp" />
+    <ClInclude Include="strfn.hpp" />
+    <ClInclude Include="strlist.hpp" />
+    <ClInclude Include="suballoc.hpp" />
+    <ClInclude Include="system.hpp" />
+    <ClInclude Include="threadpool.hpp" />
+    <ClInclude Include="timefn.hpp" />
+    <ClInclude Include="ulinks.hpp" />
+    <ClInclude Include="unicode.hpp" />
+    <ClInclude Include="unpack.hpp" />
+    <ClInclude Include="version.hpp" />
+    <ClInclude Include="volume.hpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters	                        (rev 0)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters	2013-10-26 16:37:16 UTC (rev 3044)
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="archive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="arcread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="blake2s.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cmddata.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="consio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="crc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="encname.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="errhnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="extinfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="extract.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filcreat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="file.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filefn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="filestr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="find.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="getbits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="global.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hash.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="headers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="isnt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="list.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="match.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pathfn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="qopen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rar.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rarpch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rarvm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rawread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rdwrfn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="recvol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="resource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rs16.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="scantree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="secpassword.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sha1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sha256.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="smallfn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="strfn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="strlist.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="system.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="threadpool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="timefn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="unpack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="volume.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="crypt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rijndael.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="archive.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="array.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="blake2s.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="cmddata.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="coder.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="compress.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="consio.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="crc.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="crypt.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dll.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="encname.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="errhnd.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="extinfo.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="extract.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filcreat.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="file.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filefn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filestr.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="find.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="getbits.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="global.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hash.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="headers.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="headers5.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="isnt.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="list.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="loclang.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="log.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="match.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="model.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="options.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="os.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pathfn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="qopen.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rar.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rardefs.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rarlang.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="raros.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rartypes.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rarvm.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rawread.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rdwrfn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="recvol.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rijndael.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rs.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="rs16.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="savepos.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="scantree.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="secpassword.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sha1.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sha256.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="smallfn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="strfn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="strlist.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="suballoc.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="system.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="threadpool.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="timefn.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ulinks.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="unicode.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="unpack.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="version.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="volume.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="openmpt.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: trunk/OpenMPT/include/unrar/arcread.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/arcread.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/arcread.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1326,6 +1326,7 @@
 #ifndef SHELL_EXT
 bool Archive::ReadSubData(Array<byte> *UnpData,File *DestFile)
 {
+  return false;	// OPENMPT ADDITION
   if (BrokenHeader)
   {
 #ifndef SHELL_EXT

Modified: trunk/OpenMPT/include/unrar/extract.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/extract.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/extract.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -365,6 +365,7 @@
     // DestFileName can be set empty in case of excessive -ap switch.
     ExtrFile=!SkipSolid && *DestFileName!=0 && !Arc.FileHead.SplitBefore;
 
+    /*	// OPENMPT ADDITION
     if ((Cmd->FreshFiles || Cmd->UpdateFiles) && (Command=='E' || Command=='X'))
     {
       FindData FD;
@@ -386,6 +387,7 @@
         if (Cmd->FreshFiles)
           ExtrFile=false;
     }
+    */	// OPENMPT ADDITION
 
     if (Arc.FileHead.Encrypted)
     {
@@ -545,6 +547,7 @@
       bool LinkSuccess=true; // Assume success for test mode.
       if (LinkEntry)
       {
+        /*	// OPENMPT ADDITION
         FILE_SYSTEM_REDIRECT Type=Arc.FileHead.RedirType;
 
         if (Type==FSREDIR_HARDLINK || Type==FSREDIR_FILECOPY)
@@ -581,6 +584,7 @@
             ShowChecksum=false;
           }
           PrevExtracted=FileCreateMode && LinkSuccess;
+          */	// OPENMPT ADDITION
       }
       else
         if (!Arc.FileHead.SplitBefore && !WrongPassword)
@@ -652,6 +656,7 @@
         mprintf(L"\b\b\b\b\b     ");
 #endif
 
+      /*	// OPENMPT ADDITION
       if (!TestMode && !WrongPassword && (Command=='X' || Command=='E') &&
           (!LinkEntry || Arc.FileHead.RedirType==FSREDIR_FILECOPY && LinkSuccess) && 
           (!BrokenFile || Cmd->KeepBroken))
@@ -688,6 +693,7 @@
           SetFileAttr(CurFile.FileName,Arc.FileHead.FileAttr);
         PrevExtracted=true;
       }
+      */	// OPENMPT ADDITION
     }
   }
   if (ExactMatch)
@@ -755,6 +761,8 @@
 
 void CmdExtract::ExtrPrepareName(CommandData *Cmd,Archive &Arc,const wchar *ArcFileName,wchar *DestName,size_t DestSize)
 {
+  *DestName = L'*';	// OPENMPT ADDITION
+  return;	// OPENMPT ADDITION
   wcsncpyz(DestName,Cmd->ExtrPath,DestSize);
 
   // We need IsPathDiv check here to correctly handle Unix forward slash
@@ -825,6 +833,7 @@
 #ifdef RARDLL
 bool CmdExtract::ExtrDllGetPassword(CommandData *Cmd)
 {
+  return false;	// OPENMPT ADDITION
   if (!Cmd->Password.IsSet())
   {
     if (Cmd->Callback!=NULL)
@@ -911,6 +920,7 @@
 
 void CmdExtract::ExtrCreateDir(CommandData *Cmd,Archive &Arc,const wchar *ArcFileName)
 {
+  return;	// OPENMPT ADDITION
   if (Cmd->Test)
   {
 #ifndef GUI
@@ -981,6 +991,7 @@
 
 bool CmdExtract::ExtrCreateFile(CommandData *Cmd,Archive &Arc,File &CurFile)
 {
+  return true;	// OPENMPT ADDITION
   bool Success=true;
   wchar Command=Cmd->Command[0];
 #if !defined(GUI) && !defined(SFX_MODULE)

Modified: trunk/OpenMPT/include/unrar/filcreat.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/filcreat.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/filcreat.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -7,6 +7,7 @@
                 OVERWRITE_MODE Mode,bool *UserReject,int64 FileSize,
                 RarTime *FileTime,bool WriteOnly)
 {
+  return true;	// OPENMPT ADDITION
   if (UserReject!=NULL)
     *UserReject=false;
 #ifdef _WIN_ALL
@@ -113,6 +114,7 @@
 
 bool GetAutoRenamedName(wchar *Name,size_t MaxNameSize)
 {
+  return true;	// OPENMPT ADDITION
   wchar NewName[NM];
   if (wcslen(Name)>ASIZE(NewName)-10)
     return false;

Modified: trunk/OpenMPT/include/unrar/file.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/file.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/file.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1,5 +1,9 @@
 #include "rar.hpp"
 
+#undef Min	// OPENMPT ADDITION
+#include "../../common/BuildSettings.h"	// OPENMPT ADDITION
+#include "../../soundlib/FileReader.h"	// OPENMPT ADDITION
+
 File::File()
 {
   hFile=BAD_HANDLE;
@@ -22,11 +26,13 @@
 
 File::~File()
 {
+  /*	// OPENMPT ADDITION
   if (hFile!=BAD_HANDLE && !SkipClose)
     if (NewFile)
       Delete();
     else
       Close();
+  */	// OPENMPT ADDITION
 }
 
 
@@ -42,6 +48,10 @@
 
 bool File::Open(const wchar *Name,uint Mode)
 {
+  hFile = reinterpret_cast<FileReader *>(const_cast<wchar *>(Name));	// OPENMPT ADDITION
+  hFile->Rewind();	// OPENMPT ADDITION
+  return true;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   ErrorType=FILE_SUCCESS;
   FileHandle hNewFile;
   bool OpenShared=File::OpenShared || (Mode & FMF_OPENSHARED)!=0;
@@ -111,6 +121,7 @@
     wcsncpyz(FileName,Name,ASIZE(FileName));
   }
   return Success;
+  */	// OPENMPT ADDITION
 }
 
 
@@ -134,6 +145,8 @@
 
 bool File::Create(const wchar *Name,uint Mode)
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   // OpenIndiana based NAS and CIFS shares fail to set the file time if file
   // was created in read+write mode and some data was written and not flushed
   // before SetFileTime call. So we should use the write only mode if we plan
@@ -163,6 +176,7 @@
   SkipClose=false;
   wcsncpyz(FileName,Name,ASIZE(FileName));
   return hFile!=BAD_HANDLE;
+  */	// OPENMPT ADDITION
 }
 
 
@@ -188,6 +202,7 @@
 bool File::Close()
 {
   bool Success=true;
+  /*	// OPENMPT ADDITION
   if (HandleType!=FILE_HANDLENORMAL)
     HandleType=FILE_HANDLENORMAL;
   else
@@ -205,22 +220,27 @@
       if (!Success && AllowExceptions)
         ErrHandler.CloseError(FileName);
     }
+  */	// OPENMPT ADDITION
   return Success;
 }
 
 
 void File::Flush()
 {
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   FlushFileBuffers(hFile);
 #else
   fflush(hFile);
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 bool File::Delete()
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   if (HandleType!=FILE_HANDLENORMAL)
     return false;
   if (hFile!=BAD_HANDLE)
@@ -228,11 +248,14 @@
   if (!AllowDelete)
     return false;
   return DelFile(FileName);
+  */	// OPENMPT ADDITION
 }
 
 
 bool File::Rename(const wchar *NewName)
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   // No need to rename if names are already same.
   bool Success=wcscmp(FileName,NewName)==0;
 
@@ -243,11 +266,13 @@
     wcscpy(FileName,NewName);
 
   return Success;
+  */	// OPENMPT ADDITION
 }
 
 
 void File::Write(const void *Data,size_t Size)
 {
+  /* 	// OPENMPT ADDITION
   if (Size==0)
     return;
   if (HandleType!=FILE_HANDLENORMAL)
@@ -314,11 +339,14 @@
     break;
   }
   LastWrite=true;
+  */	// OPENMPT ADDITION
 }
 
 
 int File::Read(void *Data,size_t Size)
 {
+  return hFile->ReadRaw(static_cast<char *>(Data), Size);	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   int64 FilePos=0; // Initialized only to suppress some compilers warning.
 
   if (IgnoreReadErrors)
@@ -352,12 +380,15 @@
     break;
   }
   return ReadSize;
+  */	// OPENMPT ADDITION
 }
 
 
 // Returns -1 in case of error.
 int File::DirectRead(void *Data,size_t Size)
 {
+  return Read(Data, Size);	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   const size_t MaxDeviceRead=20000;
   const size_t MaxLockedRead=32768;
@@ -406,6 +437,7 @@
     return -1;
   return (int)ReadSize;
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
@@ -425,6 +457,8 @@
     Offset=(Method==SEEK_CUR ? Tell():FileLength())+Offset;
     Method=SEEK_SET;
   }
+  return hFile->Seek((FileReader::off_t)Offset);	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   LONG HighDist=(LONG)(Offset>>32);
   if (SetFilePointer(hFile,(LONG)Offset,&HighDist,Method)==0xffffffff &&
@@ -440,11 +474,14 @@
     return false;
 #endif
   return true;
+  */	// OPENMPT ADDITION
 }
 
 
 int64 File::Tell()
 {
+  return hFile->GetPosition();	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   if (hFile==BAD_HANDLE)
     if (AllowExceptions)
       ErrHandler.SeekError(FileName);
@@ -466,11 +503,13 @@
   return ftell(hFile);
 #endif
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 void File::Prealloc(int64 Size)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   if (RawSeek(Size,SEEK_SET))
   {
@@ -486,6 +525,7 @@
   if (fd >= 0)
     fallocate(fd, 0, 0, Size);
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
@@ -505,16 +545,20 @@
 
 bool File::Truncate()
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   return SetEndOfFile(hFile)==TRUE;
 #else
   return false;
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 void File::SetOpenFileTime(RarTime *ftm,RarTime *ftc,RarTime *fta)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   // Workaround for OpenIndiana NAS time bug. If we cannot create a file
   // in write only mode, we need to flush the write buffer before calling
@@ -534,19 +578,23 @@
     fta->GetWin32(&fa);
   SetFileTime(hFile,sc ? &fc:NULL,sa ? &fa:NULL,sm ? &fm:NULL);
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 void File::SetCloseFileTime(RarTime *ftm,RarTime *fta)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _UNIX
   SetCloseFileTimeByName(FileName,ftm,fta);
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 void File::SetCloseFileTimeByName(const wchar *Name,RarTime *ftm,RarTime *fta)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _UNIX
   bool setm=ftm!=NULL && ftm->IsSet();
   bool seta=fta!=NULL && fta->IsSet();
@@ -566,11 +614,13 @@
     utime(NameA,&ut);
   }
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 void File::GetOpenFileTime(RarTime *ft)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   FILETIME FileTime;
   GetFileTime(hFile,NULL,NULL,&FileTime);
@@ -581,19 +631,25 @@
   fstat(fileno(hFile),&st);
   *ft=st.st_mtime;
 #endif
+  */	// OPENMPT ADDITION
 }
 
 
 int64 File::FileLength()
 {
+  return hFile->GetLength();	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   SaveFilePos SavePos(*this);
   Seek(0,SEEK_END);
   return Tell();
+  */	// OPENMPT ADDITION
 }
 
 
 bool File::IsDevice()
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   if (hFile==BAD_HANDLE)
     return false;
 #ifdef _WIN_ALL
@@ -602,6 +658,7 @@
 #else
   return isatty(fileno(hFile));
 #endif
+  */	// OPENMPT ADDITION
 }
 
 

Modified: trunk/OpenMPT/include/unrar/file.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/file.hpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/file.hpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1,6 +1,11 @@
 #ifndef _RAR_FILE_
 #define _RAR_FILE_
 
+class FileReader;	// OPENMPT ADDITION
+typedef FileReader* FileHandle;	// OPENMPT ADDITION
+#define BAD_HANDLE nullptr	// OPENMPT ADDITION
+
+/*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
 typedef HANDLE FileHandle;
 #define BAD_HANDLE INVALID_HANDLE_VALUE
@@ -8,6 +13,7 @@
 typedef FILE* FileHandle;
 #define BAD_HANDLE NULL
 #endif
+*/	// OPENMPT ADDITION
 
 class RAROptions;
 

Modified: trunk/OpenMPT/include/unrar/filefn.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/filefn.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/filefn.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -2,6 +2,7 @@
 
 MKDIR_CODE MakeDir(const wchar *Name,bool SetAttr,uint Attr)
 {
+  return MKDIR_SUCCESS;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   BOOL RetCode=CreateDirectory(Name,NULL);
   if (RetCode==0 && !FileExist(Name))
@@ -36,6 +37,7 @@
 
 bool CreatePath(const wchar *Path,bool SkipLastName)
 {
+  return true;	// OPENMPT ADDITION
   if (Path==NULL || *Path==0)
     return false;
 
@@ -85,6 +87,7 @@
 
 void SetDirTime(const wchar *Name,RarTime *ftm,RarTime *ftc,RarTime *fta)
 {
+  return;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   bool sm=ftm!=NULL && ftm->IsSet();
   bool sc=ftc!=NULL && ftc->IsSet();
@@ -127,6 +130,7 @@
 
 bool IsRemovable(const wchar *Name)
 {
+  return false;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   wchar Root[NM];
   GetPathRoot(Name,Root,ASIZE(Root));
@@ -141,6 +145,7 @@
 #ifndef SFX_MODULE
 int64 GetFreeDisk(const wchar *Name)
 {
+  return 0;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   wchar Root[NM];
   GetFilePath(Name,Root,ASIZE(Root));
@@ -173,6 +178,7 @@
 
 bool FileExist(const wchar *Name)
 {
+  return false;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   return GetFileAttr(Name)!=0xffffffff;
 #elif defined(ENABLE_ACCESS)
@@ -188,6 +194,7 @@
 
 bool WildFileExist(const wchar *Name)
 {
+  return false;	// OPENMPT ADDITION
   if (IsWildcard(Name))
   {
     FindFile Find;
@@ -247,6 +254,7 @@
 
 void PrepareToDelete(const wchar *Name)
 {
+  return;	// OPENMPT ADDITION
 #if defined(_WIN_ALL) || defined(_EMX)
   SetFileAttr(Name,0);
 #endif
@@ -263,6 +271,7 @@
 
 uint GetFileAttr(const wchar *Name)
 {
+  return 0;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   DWORD Attr=GetFileAttributes(Name);
   if (Attr==0xffffffff)
@@ -285,6 +294,7 @@
 
 bool SetFileAttr(const wchar *Name,uint Attr)
 {
+  return false;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   bool Success=SetFileAttributes(Name,Attr)!=0;
   if (!Success)
@@ -379,6 +389,7 @@
 
 bool RenameFile(const wchar *SrcName,const wchar *DestName)
 {
+  return true;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   bool Success=MoveFile(SrcName,DestName)!=0;
   if (!Success)
@@ -400,6 +411,7 @@
 
 bool DelFile(const wchar *Name)
 {
+  return true;	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   bool Success=DeleteFile(Name)!=0;
   if (!Success)
@@ -422,6 +434,7 @@
 #if defined(_WIN_ALL) && !defined(SFX_MODULE)
 bool SetFileCompression(const wchar *Name,bool State)
 {
+  return true;	// OPENMPT ADDITION
   HANDLE hFile=CreateFile(Name,FILE_READ_DATA|FILE_WRITE_DATA,
                  FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,
                  FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_SEQUENTIAL_SCAN,NULL);

Modified: trunk/OpenMPT/include/unrar/find.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/find.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/find.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -33,6 +33,7 @@
 
 bool FindFile::Next(FindData *fd,bool GetSymLink)
 {
+  return true;	// OPENMPT ADDITION
   fd->Error=false;
   if (*FindMask==0)
     return false;
@@ -110,6 +111,7 @@
 
 bool FindFile::FastFind(const wchar *FindMask,FindData *fd,bool GetSymLink)
 {
+  return true;	// OPENMPT ADDITION
   fd->Error=false;
 #ifndef _UNIX
   if (IsWildcard(FindMask))

Modified: trunk/OpenMPT/include/unrar/match.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/match.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/match.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -18,6 +18,7 @@
 
 bool CmpName(const wchar *Wildcard,const wchar *Name,int CmpMode)
 {
+  return true;	// OPENMPT ADDITION
   bool ForceCase=(CmpMode&MATCH_FORCECASESENSITIVE)!=0;
 
   CmpMode&=MATCH_MODEMASK;

Added: trunk/OpenMPT/include/unrar/openmpt.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/openmpt.hpp	                        (rev 0)
+++ trunk/OpenMPT/include/unrar/openmpt.hpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -0,0 +1,9 @@
+// OpenMPT definitions (so that unrar project settings are identical to settings when including rar.hpp)
+#undef Log
+#undef STRICT
+#define UNRAR
+#define SILENT
+#define RARDLL
+#define RAR_NOCRYPT
+#define NOVOLUME
+#define NOMINMAX	// For windows.h

Added: trunk/OpenMPT/include/unrar/openmpt.txt
===================================================================
--- trunk/OpenMPT/include/unrar/openmpt.txt	                        (rev 0)
+++ trunk/OpenMPT/include/unrar/openmpt.txt	2013-10-26 16:37:16 UTC (rev 3044)
@@ -0,0 +1,16 @@
+This folder is based on http://www.rarlab.com/rar/unrarsrc-5.0.12.tar.gz
+
+All modifications to existing files have been done in a manner so that no
+existing lines were edited; only new lines were added.
+Added lines can be found by looking for "// OPENMPT ADDITION" comments.
+
+The most important modifications have been done in file.cpp / file.hpp to allow
+memory-based files (using OpenMPT's own FileReader class).
+In other files, optimizations have been done to elimiate dead code that would
+never be used in OpenMPT's context.
+
+The following files have been modified:
+arcread.cpp, extract.cpp, filcreat.cpp, file.hpp, file.cpp, filefn.cpp,
+find.cpp, match.cpp, pathfn.cpp, rar.hpp, rdwrfn.cpp, secpassword.cpp,
+volume.cpp, win32acl.cpp, win32lnk.cpp
+The file openmpt.hpp has been added.
\ No newline at end of file

Modified: trunk/OpenMPT/include/unrar/pathfn.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/pathfn.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/pathfn.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -18,6 +18,7 @@
 
 wchar* ConvertPath(const wchar *SrcPath,wchar *DestPath)
 {
+  return (wchar *)SrcPath;	// OPENMPT ADDITION
   const wchar *DestPtr=SrcPath;
 
   // Prevent \..\ in any part of path string.

Modified: trunk/OpenMPT/include/unrar/rar.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/rar.hpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/rar.hpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1,6 +1,7 @@
 #ifndef _RAR_RARCOMMON_
 #define _RAR_RARCOMMON_
 
+#include "openmpt.hpp"	// OPENMPT ADDITION
 #include "raros.hpp"
 #include "os.hpp"
 

Modified: trunk/OpenMPT/include/unrar/rdwrfn.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/rdwrfn.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/rdwrfn.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -126,6 +126,7 @@
     if (Cmd->Callback!=NULL &&
         Cmd->Callback(UCM_PROCESSDATA,Cmd->UserData,(LPARAM)Addr,Count)==-1)
       ErrHandler.Exit(RARX_USERBREAK);
+    /*	// OPENMPT ADDITION
     if (Cmd->ProcessDataProc!=NULL)
     {
       // Here we preserve ESP value. It is necessary for those developers,
@@ -153,6 +154,7 @@
       if (RetCode==0)
         ErrHandler.Exit(RARX_USERBREAK);
     }
+    */	// OPENMPT ADDITION
   }
 #endif // RARDLL
 
@@ -189,6 +191,7 @@
 
 void ComprDataIO::ShowUnpRead(int64 ArcPos,int64 ArcSize)
 {
+  return;	// OPENMPT ADDITION
   if (ShowProgress && SrcFile!=NULL)
   {
     if (TotalArcSize!=0)

Modified: trunk/OpenMPT/include/unrar/secpassword.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/secpassword.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/secpassword.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1,5 +1,6 @@
 #include "rar.hpp"
 
+/*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
 typedef BOOL (WINAPI *CRYPTPROTECTMEMORY)(LPVOID pData,DWORD cbData,DWORD dwFlags);
 typedef BOOL (WINAPI *CRYPTUNPROTECTMEMORY)(LPVOID pData,DWORD cbData,DWORD dwFlags);
@@ -51,21 +52,25 @@
 // We want to call FreeLibrary when RAR is exiting.
 CryptLoader GlobalCryptLoader;
 #endif
+*/	// OPENMPT ADDITION
 
 SecPassword::SecPassword()
 {
+  return;	// OPENMPT ADDITION
   Set(L"");
 }
 
 
 SecPassword::~SecPassword()
 {
+  return;	// OPENMPT ADDITION
   Clean();
 }
 
 
 void SecPassword::Clean()
 {
+  return;	// OPENMPT ADDITION
   PasswordSet=false;
   cleandata(Password,sizeof(Password));
 }
@@ -76,6 +81,7 @@
 // So we use our own function for this purpose.
 void cleandata(void *data,size_t size)
 {
+  return;	// OPENMPT ADDITION
 #if defined(_WIN_ALL) && defined(_MSC_VER)
   SecureZeroMemory(data,size);
 #else
@@ -96,6 +102,7 @@
 // to find it in dump.
 void SecPassword::Process(const wchar *Src,size_t SrcSize,wchar *Dst,size_t DstSize,bool Encode)
 {
+  return;	// OPENMPT ADDITION
   // Source string can be shorter than destination as in case when we process
   // -p<pwd> parameter, so we need to take into account both sizes.
   memcpy(Dst,Src,Min(SrcSize,DstSize)*sizeof(*Dst));
@@ -105,6 +112,7 @@
 
 void SecPassword::Get(wchar *Psw,size_t MaxSize)
 {
+  return;	// OPENMPT ADDITION
   if (PasswordSet)
   {
     Process(Password,ASIZE(Password),Psw,MaxSize,false);
@@ -117,6 +125,7 @@
 
 void SecPassword::Set(const wchar *Psw)
 {
+  return;	// OPENMPT ADDITION
   if (*Psw==0)
   {
     PasswordSet=false;
@@ -132,6 +141,7 @@
 
 size_t SecPassword::Length()
 {
+  return 0;	// OPENMPT ADDITION
   wchar Plain[MAXPASSWORD];
   Get(Plain,ASIZE(Plain));
   size_t Length=wcslen(Plain);
@@ -142,6 +152,7 @@
 
 bool SecPassword::operator == (SecPassword &psw)
 {
+  return false;	// OPENMPT ADDITION
   // We cannot compare encoded data directly, because there is no guarantee
   // than encryption function will always produce the same result for same
   // data (salt?) and because we do not clean the rest of password buffer
@@ -158,6 +169,7 @@
 
 void SecHideData(void *Data,size_t DataSize,bool Encode)
 {
+  /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   // Try to utilize the secure Crypt[Un]ProtectMemory if possible.
   if (GlobalCryptLoader.pCryptProtectMemory==NULL)
@@ -203,4 +215,5 @@
 
   for (size_t I=0;I<DataSize;I++)
     *((byte *)Data+I)^=Key+I+75;
+  */	// OPENMPT ADDITION
 }

Modified: trunk/OpenMPT/include/unrar/volume.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/volume.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/volume.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -9,6 +9,7 @@
 
 bool MergeArchive(Archive &Arc,ComprDataIO *DataIO,bool ShowFileName,wchar Command)
 {
+  return true;	// OPENMPT ADDITION
   RAROptions *Cmd=Arc.GetRAROptions();
 
   HEADER_TYPE HeaderType=Arc.GetHeaderType();
@@ -197,6 +198,7 @@
 
 bool DllVolChange(RAROptions *Cmd,wchar *NextName,size_t NameSize)
 {
+  return true;	// OPENMPT ADDITION
   bool DllVolChanged=false,DllVolAborted=false;
 
   if (Cmd->Callback!=NULL)
@@ -270,6 +272,7 @@
 #ifdef RARDLL
 bool DllVolNotify(RAROptions *Cmd,wchar *NextName)
 {
+  return true;	// OPENMPT ADDITION
   char NextNameA[NM];
   WideToChar(NextName,NextNameA,ASIZE(NextNameA));
   if (Cmd->Callback!=NULL)

Modified: trunk/OpenMPT/include/unrar/win32acl.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/win32acl.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/win32acl.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -43,6 +43,7 @@
     return;
   }
 
+  return;	// OPENMPT ADDITION
   SECURITY_INFORMATION  si=OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|
                            DACL_SECURITY_INFORMATION;
   if (ReadSacl)
@@ -67,6 +68,7 @@
   if (!Arc.ReadSubData(&SubData,NULL))
     return;
 
+  return;	// OPENMPT ADDITION
   SetACLPrivileges();
 
   SECURITY_INFORMATION si=OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|
@@ -94,6 +96,7 @@
 
 void SetACLPrivileges()
 {
+  return;	// OPENMPT ADDITION
   static bool InitDone=false;
   if (InitDone)
     return;

Modified: trunk/OpenMPT/include/unrar/win32lnk.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/win32lnk.cpp	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/include/unrar/win32lnk.cpp	2013-10-26 16:37:16 UTC (rev 3044)
@@ -105,6 +105,8 @@
 
 bool CreateReparsePoint(CommandData *Cmd,const wchar *Name,FileHeader *hd)
 {
+  return false;	// OPENMPT ADDITION
+  /*	// OPENMPT ADDITION
   static bool PrivSet=false;
   if (!PrivSet)
   {
@@ -233,4 +235,5 @@
   if (!Cmd->IgnoreGeneralAttr)
     SetFileAttr(Name,hd->FileAttr);
   return true;
+  */	// OPENMPT ADDITION
 }

Modified: trunk/OpenMPT/mptrack/MPTRACK_10.sln
===================================================================
--- trunk/OpenMPT/mptrack/MPTRACK_10.sln	2013-10-26 16:16:54 UTC (rev 3043)
+++ trunk/OpenMPT/mptrack/MPTRACK_10.sln	2013-10-26 16:37:16 UTC (rev 3044)
@@ -1,6 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mptrack", "mptrack_10.vcxproj", "{21D95071-FB97-4E69-B3B1-050D0D4A5021}"
+	ProjectSection(ProjectDependencies) = postProject
+		{95CC809B-03FC-4EDB-BB20-FD07A698C05F} = {95CC809B-03FC-4EDB-BB20-FD07A698C05F}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flac", "..\include\flac\flac.vcxproj", "{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}"
 EndProject
@@ -20,73 +23,146 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\include\portmidi\portmidi.vcxproj", "{2512E2CA-578A-4F10-9363-4BFC9A5EF960}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnRAR", "..\include\unrar\UnRAR.vcxproj", "{95CC809B-03FC-4EDB-BB20-FD07A698C05F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 		ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32
+		ReleaseNoLTCG|x64 = ReleaseNoLTCG|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.ActiveCfg = Debug|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.Build.0 = Debug|Win32
+		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|x64.ActiveCfg = Debug|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.ActiveCfg = ReleaseLTCG|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.Build.0 = ReleaseLTCG|Win32
+		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|x64.ActiveCfg = Release|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32
 		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32
+		{21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|x64.ActiveCfg = Release|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.ActiveCfg = DebugLib|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|Win32.Build.0 = DebugLib|Win32
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.ActiveCfg = DebugLib|x64
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Debug|x64.Build.0 = DebugLib|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.ActiveCfg = ReleaseLib|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = ReleaseLib|Win32
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = ReleaseLib|x64
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = ReleaseLib|x64
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.ActiveCfg = NormalLib|Win32
 		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|Win32.Build.0 = NormalLib|Win32
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseLib|x64
+		{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.ReleaseNoLTCG|x64.Build.0 = ReleaseLib|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.ActiveCfg = DebugLib|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|Win32.Build.0 = DebugLib|Win32
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.ActiveCfg = DebugLib|x64
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Debug|x64.Build.0 = DebugLib|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.ActiveCfg = ReleaseLib|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|Win32.Build.0 = ReleaseLib|Win32
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.ActiveCfg = ReleaseLib|x64
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.Release|x64.Build.0 = ReleaseLib|x64
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.ActiveCfg = NormalLib|Win32
 		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|Win32.Build.0 = NormalLib|Win32
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.ActiveCfg = ReleaseLib|x64
+		{6B11F6A8-B131-4D2B-80EF-5731A9016436}.ReleaseNoLTCG|x64.Build.0 = ReleaseLib|x64
 		{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = DebugLib|Win32
 		{189B867F-FF4B-45A1-B74...
 
[truncated message content]

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

[<sag...@us...>]

Revision: 3045
          http://sourceforge.net/p/modplug/code/3045
Author:   saga-games
Date:     2013-10-26 18:12:34 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
[Ref] Use wrapper functions for FileReader access in UnRAR to reduce complexity of dependencies between projects.

Modified Paths:
--------------
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
    trunk/OpenMPT/include/unrar/file.cpp
    trunk/OpenMPT/include/unrar/file.hpp
    trunk/OpenMPT/include/unrar/openmpt.hpp
    trunk/OpenMPT/unarchiver/unrar.cpp
    trunk/OpenMPT/unarchiver/unrar.h

Added Paths:
-----------
    trunk/OpenMPT/include/unrar/openmpt-callback.hpp

Modified: trunk/OpenMPT/include/unrar/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcxproj	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcxproj	2013-10-26 18:12:34 UTC (rev 3045)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="Debug|Win32">
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -106,7 +106,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>UNRAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -132,7 +132,7 @@
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -169,7 +169,7 @@
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>UNRAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -289,6 +289,7 @@
     <ClInclude Include="log.hpp" />
     <ClInclude Include="match.hpp" />
     <ClInclude Include="model.hpp" />
+    <ClInclude Include="openmpt-callback.hpp" />
     <ClInclude Include="openmpt.hpp" />
     <ClInclude Include="options.hpp" />
     <ClInclude Include="os.hpp" />

Modified: trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters	2013-10-26 18:12:34 UTC (rev 3045)
@@ -359,5 +359,8 @@
     <ClInclude Include="openmpt.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="openmpt-callback.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/OpenMPT/include/unrar/file.cpp
===================================================================
--- trunk/OpenMPT/include/unrar/file.cpp	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/include/unrar/file.cpp	2013-10-26 18:12:34 UTC (rev 3045)
@@ -1,9 +1,6 @@
 #include "rar.hpp"
+#include "openmpt-callback.hpp"	// OPENMPT ADDITION
 
-#undef Min	// OPENMPT ADDITION
-#include "../../common/BuildSettings.h"	// OPENMPT ADDITION
-#include "../../soundlib/FileReader.h"	// OPENMPT ADDITION
-
 File::File()
 {
   hFile=BAD_HANDLE;
@@ -48,8 +45,8 @@
 
 bool File::Open(const wchar *Name,uint Mode)
 {
-  hFile = reinterpret_cast<FileReader *>(const_cast<wchar *>(Name));	// OPENMPT ADDITION
-  hFile->Rewind();	// OPENMPT ADDITION
+  hFile = reinterpret_cast<RARFileCallbacks *>(const_cast<wchar *>(Name));	// OPENMPT ADDITION
+  hFile->Seek(hFile->file, 0);	// OPENMPT ADDITION
   return true;	// OPENMPT ADDITION
   /*	// OPENMPT ADDITION
   ErrorType=FILE_SUCCESS;
@@ -345,7 +342,7 @@
 
 int File::Read(void *Data,size_t Size)
 {
-  return hFile->ReadRaw(static_cast<char *>(Data), Size);	// OPENMPT ADDITION
+  return hFile->ReadRaw(hFile->file, static_cast<char *>(Data), Size);	// OPENMPT ADDITION
   /*	// OPENMPT ADDITION
   int64 FilePos=0; // Initialized only to suppress some compilers warning.
 
@@ -457,7 +454,7 @@
     Offset=(Method==SEEK_CUR ? Tell():FileLength())+Offset;
     Method=SEEK_SET;
   }
-  return hFile->Seek((FileReader::off_t)Offset);	// OPENMPT ADDITION
+  return hFile->Seek(hFile->file, (size_t)Offset);	// OPENMPT ADDITION
   /*	// OPENMPT ADDITION
 #ifdef _WIN_ALL
   LONG HighDist=(LONG)(Offset>>32);
@@ -480,7 +477,7 @@
 
 int64 File::Tell()
 {
-  return hFile->GetPosition();	// OPENMPT ADDITION
+  return hFile->GetPosition(hFile->file);	// OPENMPT ADDITION
   /*	// OPENMPT ADDITION
   if (hFile==BAD_HANDLE)
     if (AllowExceptions)
@@ -637,7 +634,7 @@
 
 int64 File::FileLength()
 {
-  return hFile->GetLength();	// OPENMPT ADDITION
+  return hFile->GetLength(hFile->file);	// OPENMPT ADDITION
   /*	// OPENMPT ADDITION
   SaveFilePos SavePos(*this);
   Seek(0,SEEK_END);

Modified: trunk/OpenMPT/include/unrar/file.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/file.hpp	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/include/unrar/file.hpp	2013-10-26 18:12:34 UTC (rev 3045)
@@ -1,8 +1,8 @@
 #ifndef _RAR_FILE_
 #define _RAR_FILE_
 
-class FileReader;	// OPENMPT ADDITION
-typedef FileReader* FileHandle;	// OPENMPT ADDITION
+struct RARFileCallbacks;	// OPENMPT ADDITION
+typedef RARFileCallbacks* FileHandle;	// OPENMPT ADDITION
 #define BAD_HANDLE nullptr	// OPENMPT ADDITION
 
 /*	// OPENMPT ADDITION

Added: trunk/OpenMPT/include/unrar/openmpt-callback.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/openmpt-callback.hpp	                        (rev 0)
+++ trunk/OpenMPT/include/unrar/openmpt-callback.hpp	2013-10-26 18:12:34 UTC (rev 3045)
@@ -0,0 +1,30 @@
+/*
+ * openmpt-callback.hpp
+ * --------------------
+ * Purpose: Wrapper functions for FileReader, so that it can be used easily in UnRAR.
+ * Notes  : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+#pragma once
+
+class FileReader;
+
+struct RARFileCallbacks
+{
+	typedef size_t (CALLBACK *RAR_READRAW) (FileReader &file, char *data, size_t size);
+	typedef bool (CALLBACK *RAR_SEEK) (FileReader &file, size_t offset);
+	typedef size_t (CALLBACK *RAR_GETPOSITION) (FileReader &file);
+	typedef size_t (CALLBACK *RAR_GETLENGTH) (FileReader &file);
+
+	RAR_READRAW ReadRaw;
+	RAR_SEEK Seek;
+	RAR_GETPOSITION GetPosition;
+	RAR_GETLENGTH GetLength;
+
+	FileReader &file;
+
+	RARFileCallbacks(RAR_READRAW readFunc, RAR_SEEK seekFunc, RAR_GETPOSITION getPosFunc, RAR_GETLENGTH getLenFunc, FileReader &f)
+		: ReadRaw(readFunc), Seek(seekFunc), GetPosition(getPosFunc), GetLength(getLenFunc), file(f) { }
+};

Modified: trunk/OpenMPT/include/unrar/openmpt.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/openmpt.hpp	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/include/unrar/openmpt.hpp	2013-10-26 18:12:34 UTC (rev 3045)
@@ -1,4 +1,12 @@
-// OpenMPT definitions (so that unrar project settings are identical to settings when including rar.hpp)
+/*
+ * openmpt.hpp
+ * -----------
+ * Purpose: Various definitions, so that UnRAR project settings are identical to OpenMPT's settings when including rar.hpp
+ * Notes  : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
 #undef Log
 #undef STRICT
 #define UNRAR
@@ -6,4 +14,4 @@
 #define RARDLL
 #define RAR_NOCRYPT
 #define NOVOLUME
-#define NOMINMAX	// For windows.h
+#define NOMINMAX	// For windows.h

Modified: trunk/OpenMPT/unarchiver/unrar.cpp
===================================================================
--- trunk/OpenMPT/unarchiver/unrar.cpp	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/unarchiver/unrar.cpp	2013-10-26 18:12:34 UTC (rev 3045)
@@ -9,6 +9,7 @@
 
 #include "stdafx.h"
 #include "unrar.h"
+#include "../include/unrar/openmpt-callback.hpp"
 
 #if MPT_COMPILER_MSVC
 // Disable "unreferenced formal parameter" and type conversion warnings
@@ -24,38 +25,37 @@
 {
 	CommandData Cmd;
 	Archive Arc;
+	RARFileCallbacks callbacks;
 	int64 firstBlock;
 
-	RARData() : Arc(&Cmd) { }
-};
+	RARData(FileReader &file) : Arc(&Cmd), callbacks(ReadRaw, Seek, GetPosition, GetLength, file) { }
 
+	// FileReader callbacks
+	static size_t CALLBACK ReadRaw(FileReader &file, char *data, size_t size) { return file.ReadRaw(data, size); };
+	static bool CALLBACK Seek(FileReader &file, size_t offset) { return file.Seek(offset); };
+	static size_t CALLBACK GetPosition(FileReader &file) { return file.GetPosition(); };
+	static size_t CALLBACK GetLength(FileReader &file) { return file.GetLength(); };
 
-static int CALLBACK ProcessRARDataProc(unsigned int msg, LPARAM userData, LPARAM p1, LPARAM p2)
-//---------------------------------------------------------------------------------------------
-{
-	if(msg == UCM_PROCESSDATA)
+	static int CALLBACK RARCallback(unsigned int msg, LPARAM userData, LPARAM p1, LPARAM p2)
 	{
-		// Receive extracted data
-		CRarArchive *that = reinterpret_cast<CRarArchive *>(userData);
-		that->WriteData(reinterpret_cast<const char *>(p1), p2);
-		return 1;
+		if(msg == UCM_PROCESSDATA)
+		{
+			// Receive extracted data
+			CRarArchive *that = reinterpret_cast<CRarArchive *>(userData);
+			const char *data = reinterpret_cast<const char *>(p1);
+			that->data.insert(that->data.end(), data, data + p2);
+			return 1;
+		}
+		// No support for passwords or volumes
+		return 0;
 	}
-	// No support for passwords or volumes
-	return 0;
-}
+};
 
 
-void CRarArchive::WriteData(const char *d, size_t s)
-//--------------------------------------------------
-{
-	data.insert(data.end(), d, d + s);
-}
-
-
 CRarArchive::CRarArchive(FileReader &file) : ArchiveBase(file)
 //------------------------------------------------------------
 {
-	rarData = new (std::nothrow) RARData();
+	rarData = new (std::nothrow) RARData(inFile);
 	if(rarData == nullptr)
 	{
 		return;
@@ -66,7 +66,7 @@
 		rarData->Cmd.FileArgs.AddString(MASKALL);
 		rarData->Cmd.VersionControl = 1;
 
-		rarData->Arc.Open(reinterpret_cast<wchar *>(&inFile), 0);
+		rarData->Arc.Open(reinterpret_cast<wchar *>(&rarData->callbacks), 0);
 		if(!rarData->Arc.IsArchive(false))
 		{
 			return;
@@ -142,7 +142,7 @@
 		// Extract real file
 		data.clear();
 		data.reserve(static_cast<size_t>(rarData->Arc.FileHead.UnpSize));
-		rarData->Cmd.Callback = ProcessRARDataProc;
+		rarData->Cmd.Callback = RARData::RARCallback;
 		Extract.ExtractCurrentFile(&rarData->Cmd, rarData->Arc, headerSize, repeat);
 		return !data.empty();
 	} catch(...)

Modified: trunk/OpenMPT/unarchiver/unrar.h
===================================================================
--- trunk/OpenMPT/unarchiver/unrar.h	2013-10-26 16:37:16 UTC (rev 3044)
+++ trunk/OpenMPT/unarchiver/unrar.h	2013-10-26 18:12:34 UTC (rev 3045)
@@ -18,6 +18,7 @@
 //====================================
 {
 protected:
+	friend struct RARData;
 	RARData *rarData;
 
 public:
@@ -25,6 +26,4 @@
 	virtual ~CRarArchive();
 	
 	virtual bool ExtractFile(std::size_t index);
-
-	void WriteData(const char *d, size_t s);
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3046
          http://sourceforge.net/p/modplug/code/3046
Author:   manxorist
Date:     2013-10-26 18:33:08 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
[Ref] Convert unrar to premake.
[Fix] Remove unneeded VS2010 project dependency.
[Fix] Fix VS2010 win32 ReleaseNoLTCG config.

Modified Paths:
--------------
    trunk/OpenMPT/include/premake4.lua
    trunk/OpenMPT/include/unrar/UnRAR.vcproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
    trunk/OpenMPT/mptrack/MPTRACK_10.sln

Property Changed:
----------------
    trunk/OpenMPT/include/unrar/

Modified: trunk/OpenMPT/include/premake4.lua
===================================================================
--- trunk/OpenMPT/include/premake4.lua	2013-10-26 18:12:34 UTC (rev 3045)
+++ trunk/OpenMPT/include/premake4.lua	2013-10-26 18:33:08 UTC (rev 3046)
@@ -4,6 +4,134 @@
  
  
  
+ project "UnRAR"
+  uuid "95CC809B-03FC-4EDB-BB20-FD07A698C05F"
+  language "C++"
+  location "unrar"
+  includedirs { "unrar" }
+  files {
+   "unrar/archive.cpp",
+   "unrar/arcread.cpp",
+   "unrar/blake2s.cpp",
+   "unrar/cmddata.cpp",
+   "unrar/consio.cpp",
+   "unrar/crc.cpp",
+   "unrar/crypt.cpp",
+   "unrar/encname.cpp",
+   "unrar/errhnd.cpp",
+   "unrar/extinfo.cpp",
+   "unrar/extract.cpp",
+   "unrar/filcreat.cpp",
+   "unrar/file.cpp",
+   "unrar/filefn.cpp",
+   "unrar/filestr.cpp",
+   "unrar/find.cpp",
+   "unrar/getbits.cpp",
+   "unrar/global.cpp",
+   "unrar/hash.cpp",
+   "unrar/headers.cpp",
+   "unrar/isnt.cpp",
+   "unrar/list.cpp",
+   "unrar/match.cpp",
+   "unrar/options.cpp",
+   "unrar/pathfn.cpp",
+   "unrar/qopen.cpp",
+   "unrar/rar.cpp",
+   "unrar/rarpch.cpp",
+   "unrar/rarvm.cpp",
+   "unrar/rawread.cpp",
+   "unrar/rdwrfn.cpp",
+   "unrar/recvol.cpp",
+   "unrar/resource.cpp",
+   "unrar/rijndael.cpp",
+   "unrar/rs.cpp",
+   "unrar/rs16.cpp",
+   "unrar/scantree.cpp",
+   "unrar/secpassword.cpp",
+   "unrar/sha1.cpp",
+   "unrar/sha256.cpp",
+   "unrar/smallfn.cpp",
+   "unrar/strfn.cpp",
+   "unrar/strlist.cpp",
+   "unrar/system.cpp",
+   "unrar/threadpool.cpp",
+   "unrar/timefn.cpp",
+   "unrar/unicode.cpp",
+   "unrar/unpack.cpp",
+   "unrar/volume.cpp",
+  }
+  files {
+   "unrar/archive.hpp",
+   "unrar/array.hpp",
+   "unrar/blake2s.hpp",
+   "unrar/cmddata.hpp",
+   "unrar/coder.hpp",
+   "unrar/compress.hpp",
+   "unrar/consio.hpp",
+   "unrar/crc.hpp",
+   "unrar/crypt.hpp",
+   "unrar/dll.hpp",
+   "unrar/encname.hpp",
+   "unrar/errhnd.hpp",
+   "unrar/extinfo.hpp",
+   "unrar/extract.hpp",
+   "unrar/filcreat.hpp",
+   "unrar/file.hpp",
+   "unrar/filefn.hpp",
+   "unrar/filestr.hpp",
+   "unrar/find.hpp",
+   "unrar/getbits.hpp",
+   "unrar/global.hpp",
+   "unrar/hash.hpp",
+   "unrar/headers.hpp",
+   "unrar/headers5.hpp",
+   "unrar/isnt.hpp",
+   "unrar/list.hpp",
+   "unrar/loclang.hpp",
+   "unrar/log.hpp",
+   "unrar/match.hpp",
+   "unrar/model.hpp",
+   "unrar/openmpt.hpp",
+   "unrar/openmpt-callback.hpp",
+   "unrar/options.hpp",
+   "unrar/os.hpp",
+   "unrar/pathfn.hpp",
+   "unrar/qopen.hpp",
+   "unrar/rar.hpp",
+   "unrar/rardefs.hpp",
+   "unrar/rarlang.hpp",
+   "unrar/raros.hpp",
+   "unrar/rartypes.hpp",
+   "unrar/rarvm.hpp",
+   "unrar/rawread.hpp",
+   "unrar/rdwrfn.hpp",
+   "unrar/recvol.hpp",
+   "unrar/resource.hpp",
+   "unrar/rijndael.hpp",
+   "unrar/rs.hpp",
+   "unrar/rs16.hpp",
+   "unrar/savepos.hpp",
+   "unrar/scantree.hpp",
+   "unrar/secpassword.hpp",
+   "unrar/sha1.hpp",
+   "unrar/sha256.hpp",
+   "unrar/smallfn.hpp",
+   "unrar/strfn.hpp",
+   "unrar/strlist.hpp",
+   "unrar/suballoc.hpp",
+   "unrar/system.hpp",
+   "unrar/threadpool.hpp",
+   "unrar/timefn.hpp",
+   "unrar/ulinks.hpp",
+   "unrar/unicode.hpp",
+   "unrar/unpack.hpp",
+   "unrar/version.hpp",
+   "unrar/volume.hpp",
+  }
+  dofile "premake4-defaults.lua"
+  
+  
+  
  project "zlib"
   uuid "1654FB18-FDE6-406F-9D84-BA12BFBD67B2"
   language "C"

Index: trunk/OpenMPT/include/unrar
===================================================================
--- trunk/OpenMPT/include/unrar	2013-10-26 18:12:34 UTC (rev 3045)
+++ trunk/OpenMPT/include/unrar	2013-10-26 18:33:08 UTC (rev 3046)

Property changes on: trunk/OpenMPT/include/unrar
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
 *.user
 build
+obj
Modified: trunk/OpenMPT/include/unrar/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcproj	2013-10-26 18:12:34 UTC (rev 3045)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcproj	2013-10-26 18:33:08 UTC (rev 3046)
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="UnRAR"
 	ProjectGUID="{95CC809B-03FC-4EDB-BB20-FD07A698C05F}"
 	RootNamespace="UnRAR"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -20,10 +19,10 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="build\unrar32\$(ConfigurationName)"
-			IntermediateDirectory="build\unrar32\$(ConfigurationName)\obj"
-			ConfigurationType="1"
+			Name="DebugLib|Win32"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x32\DebugLib"
+			ConfigurationType="4"
 			CharacterSet="2"
 			>
 			<Tool
@@ -43,36 +42,32 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				PreprocessorDefinitions="MODPLUG_TRACKER"
-				MinimalRebuild="false"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="rar.hpp"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
 				DebugInformationFormat="4"
-				CallingConvention="2"
-				DisableSpecificWarnings="4007;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -93,14 +88,17 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="build\unrar64\$(ConfigurationName)"
-			IntermediateDirectory="build\unrar64\$(ConfigurationName)\obj"
-			ConfigurationType="1"
+			Name="DebugLib|x64"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x64\DebugLib"
+			ConfigurationType="4"
 			CharacterSet="2"
 			>
 			<Tool
@@ -121,36 +119,32 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
 				Optimization="0"
-				PreprocessorDefinitions="MODPLUG_TRACKER"
-				MinimalRebuild="false"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="rar.hpp"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
 				DebugInformationFormat="3"
-				CallingConvention="2"
-				DisableSpecificWarnings="4007;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -171,16 +165,18 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="build\unrar32\$(ConfigurationName)"
-			IntermediateDirectory="build\unrar32\$(ConfigurationName)\obj"
-			ConfigurationType="1"
+			Name="NormalLib|Win32"
+			OutputDirectory="..\bin\NormalLib"
+			IntermediateDirectory="obj\x32\NormalLib"
+			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -199,47 +195,188 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/GL- /MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="NormalLib|x64"
+			OutputDirectory="..\bin\NormalLib"
+			IntermediateDirectory="obj\x64\NormalLib"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/GL- /MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="ReleaseLib|Win32"
+			OutputDirectory="..\bin\ReleaseLib"
+			IntermediateDirectory="obj\x32\ReleaseLib"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="0"
-				OmitFramePointers="true"
-				WholeProgramOptimization="false"
-				PreprocessorDefinitions="MODPLUG_TRACKER"
-				MinimalRebuild="false"
+				Optimization="3"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				FloatingPointModel="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="rar.hpp"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
 				DebugInformationFormat="3"
-				CallingConvention="2"
-				DisableSpecificWarnings="4007;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -260,16 +397,18 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="build\unrar64\$(ConfigurationName)"
-			IntermediateDirectory="build\unrar64\$(ConfigurationName)\obj"
-			ConfigurationType="1"
+			Name="ReleaseLib|x64"
+			OutputDirectory="..\bin\ReleaseLib"
+			IntermediateDirectory="obj\x64\ReleaseLib"
+			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -290,44 +429,32 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				Optimization="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="0"
-				OmitFramePointers="true"
-				WholeProgramOptimization="false"
-				PreprocessorDefinitions="MODPLUG_TRACKER"
-				StringPooling="false"
-				MinimalRebuild="false"
+				Optimization="3"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				BufferSecurityCheck="true"
 				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="rar.hpp"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
 				DebugInformationFormat="3"
-				CallingConvention="2"
-				DisableSpecificWarnings="4007;4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="."
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				TargetMachine="17"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -348,6 +475,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -355,284 +485,466 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+		<File
+			RelativePath="archive.cpp"
 			>
-			<File
-				RelativePath="archive.cpp"
-				>
-			</File>
-			<File
-				RelativePath="arcread.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\blake2s.cpp"
-				>
-			</File>
-			<File
-				RelativePath="cmddata.cpp"
-				>
-			</File>
-			<File
-				RelativePath="consio.cpp"
-				>
-			</File>
-			<File
-				RelativePath="crc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="crypt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="encname.cpp"
-				>
-			</File>
-			<File
-				RelativePath="errhnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="extinfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="extract.cpp"
-				>
-			</File>
-			<File
-				RelativePath="filcreat.cpp"
-				>
-			</File>
-			<File
-				RelativePath="file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="filefn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="filestr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="find.cpp"
-				>
-			</File>
-			<File
-				RelativePath="getbits.cpp"
-				>
-			</File>
-			<File
-				RelativePath="global.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\hash.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\headers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="isnt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="list.cpp"
-				>
-			</File>
-			<File
-				RelativePath="match.cpp"
-				>
-			</File>
-			<File
-				RelativePath="options.cpp"
-				>
-			</File>
-			<File
-				RelativePath="pathfn.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\qopen.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rarpch.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="rarvm.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rawread.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rdwrfn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="recvol.cpp"
-				>
-			</File>
-			<File
-				RelativePath="resource.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rijndael.cpp"
-				>
-			</File>
-			<File
-				RelativePath="rs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\rs16.cpp"
-				>
-			</File>
-			<File
-				RelativePath="scantree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="secpassword.cpp"
-				>
-			</File>
-			<File
-				RelativePath="sha1.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sha256.cpp"
-				>
-			</File>
-			<File
-				RelativePath="smallfn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="strfn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="strlist.cpp"
-				>
-			</File>
-			<File
-				RelativePath="system.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\threadpool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="timefn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="unicode.cpp"
-				>
-			</File>
-			<File
-				RelativePath="unpack.cpp"
-				>
-			</File>
-			<File
-				RelativePath="volume.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+		</File>
+		<File
+			RelativePath="arcread.cpp"
 			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+		</File>
+		<File
+			RelativePath="blake2s.cpp"
 			>
-		</Filter>
+		</File>
+		<File
+			RelativePath="cmddata.cpp"
+			>
+		</File>
+		<File
+			RelativePath="consio.cpp"
+			>
+		</File>
+		<File
+			RelativePath="crc.cpp"
+			>
+		</File>
+		<File
+			RelativePath="crypt.cpp"
+			>
+		</File>
+		<File
+			RelativePath="encname.cpp"
+			>
+		</File>
+		<File
+			RelativePath="errhnd.cpp"
+			>
+		</File>
+		<File
+			RelativePath="extinfo.cpp"
+			>
+		</File>
+		<File
+			RelativePath="extract.cpp"
+			>
+		</File>
+		<File
+			RelativePath="filcreat.cpp"
+			>
+		</File>
+		<File
+			RelativePath="file.cpp"
+			>
+		</File>
+		<File
+			RelativePath="filefn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="filestr.cpp"
+			>
+		</File>
+		<File
+			RelativePath="find.cpp"
+			>
+		</File>
+		<File
+			RelativePath="getbits.cpp"
+			>
+		</File>
+		<File
+			RelativePath="global.cpp"
+			>
+		</File>
+		<File
+			RelativePath="hash.cpp"
+			>
+		</File>
+		<File
+			RelativePath="headers.cpp"
+			>
+		</File>
+		<File
+			RelativePath="isnt.cpp"
+			>
+		</File>
+		<File
+			RelativePath="list.cpp"
+			>
+		</File>
+		<File
+			RelativePath="match.cpp"
+			>
+		</File>
+		<File
+			RelativePath="options.cpp"
+			>
+		</File>
+		<File
+			RelativePath="pathfn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="qopen.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rar.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rarpch.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rarvm.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rawread.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rdwrfn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="recvol.cpp"
+			>
+		</File>
+		<File
+			RelativePath="resource.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rijndael.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rs.cpp"
+			>
+		</File>
+		<File
+			RelativePath="rs16.cpp"
+			>
+		</File>
+		<File
+			RelativePath="scantree.cpp"
+			>
+		</File>
+		<File
+			RelativePath="secpassword.cpp"
+			>
+		</File>
+		<File
+			RelativePath="sha1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="sha256.cpp"
+			>
+		</File>
+		<File
+			RelativePath="smallfn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="strfn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="strlist.cpp"
+			>
+		</File>
+		<File
+			RelativePath="system.cpp"
+			>
+		</File>
+		<File
+			RelativePath="threadpool.cpp"
+			>
+		</File>
+		<File
+			RelativePath="timefn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="unicode.cpp"
+			>
+		</File>
+		<File
+			RelativePath="unpack.cpp"
+			>
+		</File>
+		<File
+			RelativePath="volume.cpp"
+			>
+		</File>
+		<File
+			RelativePath="archive.hpp"
+			>
+		</File>
+		<File
+			RelativePath="array.hpp"
+			>
+		</File>
+		<File
+			RelativePath="blake2s.hpp"
+			>
+		</File>
+		<File
+			RelativePath="cmddata.hpp"
+			>
+		</File>
+		<File
+			RelativePath="coder.hpp"
+			>
+		</File>
+		<File
+			RelativePath="compress.hpp"
+			>
+		</File>
+		<File
+			RelativePath="consio.hpp"
+			>
+		</File>
+		<File
+			RelativePath="crc.hpp"
+			>
+		</File>
+		<File
+			RelativePath="crypt.hpp"
+			>
+		</File>
+		<File
+			RelativePath="dll.hpp"
+			>
+		</File>
+		<File
+			RelativePath="encname.hpp"
+			>
+		</File>
+		<File
+			RelativePath="errhnd.hpp"
+			>
+		</File>
+		<File
+			RelativePath="extinfo.hpp"
+			>
+		</File>
+		<File
+			RelativePath="extract.hpp"
+			>
+		</File>
+		<File
+			RelativePath="filcreat.hpp"
+			>
+		</File>
+		<File
+			RelativePath="file.hpp"
+			>
+		</File>
+		<File
+			RelativePath="filefn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="filestr.hpp"
+			>
+		</File>
+		<File
+			RelativePath="find.hpp"
+			>
+		</File>
+		<File
+			RelativePath="getbits.hpp"
+			>
+		</File>
+		<File
+			RelativePath="global.hpp"
+			>
+		</File>
+		<File
+			RelativePath="hash.hpp"
+			>
+		</File>
+		<File
+			RelativePath="headers.hpp"
+			>
+		</File>
+		<File
+			RelativePath="headers5.hpp"
+			>
+		</File>
+		<File
+			RelativePath="isnt.hpp"
+			>
+		</File>
+		<File
+			RelativePath="list.hpp"
+			>
+		</File>
+		<File
+			RelativePath="loclang.hpp"
+			>
+		</File>
+		<File
+			RelativePath="log.hpp"
+			>
+		</File>
+		<File
+			RelativePath="match.hpp"
+			>
+		</File>
+		<File
+			RelativePath="model.hpp"
+			>
+		</File>
+		<File
+			RelativePath="openmpt.hpp"
+			>
+		</File>
+		<File
+			RelativePath="openmpt-callback.hpp"
+			>
+		</File>
+		<File
+			RelativePath="options.hpp"
+			>
+		</File>
+		<File
+			RelativePath="os.hpp"
+			>
+		</File>
+		<File
+			RelativePath="pathfn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="qopen.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rar.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rardefs.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rarlang.hpp"
+			>
+		</File>
+		<File
+			RelativePath="raros.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rartypes.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rarvm.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rawread.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rdwrfn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="recvol.hpp"
+			>
+		</File>
+		<File
+			RelativePath="resource.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rijndael.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rs.hpp"
+			>
+		</File>
+		<File
+			RelativePath="rs16.hpp"
+			>
+		</File>
+		<File
+			RelativePath="savepos.hpp"
+			>
+		</File>
+		<File
+			RelativePath="scantree.hpp"
+			>
+		</File>
+		<File
+			RelativePath="secpassword.hpp"
+			>
+		</File>
+		<File
+			RelativePath="sha1.hpp"
+			>
+		</File>
+		<File
+			RelativePath="sha256.hpp"
+			>
+		</File>
+		<File
+			RelativePath="smallfn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="strfn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="strlist.hpp"
+			>
+		</File>
+		<File
+			RelativePath="suballoc.hpp"
+			>
+		</File>
+		<File
+			RelativePath="system.hpp"
+			>
+		</File>
+		<File
+			RelativePath="threadpool.hpp"
+			>
+		</File>
+		<File
+			RelativePath="timefn.hpp"
+			>
+		</File>
+		<File
+			RelativePath="ulinks.hpp"
+			>
+		</File>
+		<File
+			RelativePath="unicode.hpp"
+			>
+		</File>
+		<File
+			RelativePath="unpack.hpp"
+			>
+		</File>
+		<File
+			RelativePath="version.hpp"
+			>
+		</File>
+		<File
+			RelativePath="volume.hpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: trunk/OpenMPT/include/unrar/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/include/unrar/UnRAR.vcxproj	2013-10-26 18:12:34 UTC (rev 3045)
+++ trunk/OpenMPT/include/unrar/UnRAR.vcxproj	2013-10-26 18:33:08 UTC (rev 3046)
@@ -1,332 +1,455 @@
 <?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="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
-    <RootNamespace>UnRAR</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <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)'=='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)'=='Release|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)'=='Debug|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.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\unrar32\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\unrar32\$(Configuration)\obj\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\unrar64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\unrar64\$(Configuration)\obj\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\unrar32\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\unrar32\$(Configuration)\obj\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\unrar64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\unrar64\$(Configuration)\obj\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>StdCall</CallingConvention>
-      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>StdCall</CallingConvention>
-      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>StdCall</CallingConvention>
-      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>false</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>StdCall</CallingConvention>
-      <DisableSpecificWarnings>4007;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>
-      </LinkTimeCodeGeneration>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="archive.cpp" />
-    <ClCompile Include="arcread.cpp" />
-    <ClCompile Include="blake2s.cpp" />
-    <ClCompile Include="cmddata.cpp" />
-    <ClCompile Include="consio.cpp" />
-    <ClCompile Include="crc.cpp" />
-    <ClCompile Include="crypt.cpp" />
-    <ClCompile Include="encname.cpp" />
-    <ClCompile Include="errhnd.cpp" />
-    <ClCompile Include="extinfo.cpp" />
-    <ClCompile Include="extract.cpp" />
-    <ClCompile Include="filcreat.cpp" />
-    <ClCompile Include="file.cpp" />
-    <ClCompile Include="filefn.cpp" />
-    <ClCompile Include="filestr.cpp" />
-    <ClCompile Include="find.cpp" />
-    <ClCompile Include="getbits.cpp" />
-    <ClCompile Include="global.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="hash.cpp" />
-    <ClCompile Include="headers.cpp" />
-    <ClCompile Include="isnt.cpp" />
-    <ClCompile Include="list.cpp" />
-    <ClCompile Include="match.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="pathfn.cpp" />
-    <ClCompile Include="qopen.cpp" />
-    <ClCompile Include="rar.cpp" />
-    <ClCompile Include="rarpch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="rarvm.cpp" />
-    <ClCompile Include="rawread.cpp" />
-    <ClCompile Include="rdwrfn.cpp" />
-    <ClCompile Include="recvol.cpp" />
-    <ClCompile Include="resource.cpp" />
-    <ClCompile Include="rijndael.cpp" />
-    <ClCompile Include="rs.cpp" />
-    <ClCompile Include="rs16.cpp" />
-    <ClCompile Include="scantree.cpp" />
-    <ClCompile Include="secpassword.cpp" />
-    <ClCompile Include="sha1.cpp" />
-    <ClCompile Include="sha256.cpp" />
-    <ClCompile Include="smallfn.cpp" />
-    <ClCompile Include="strfn.cpp" />
-    <ClCompile Include="strlist.cpp" />
-    <ClCompile Include="system.cpp" />
-    <ClCompile Include="threadpool.cpp" />
-    <ClCompile Include="timefn.cpp" />
-    <ClCompile Include="unicode.cpp" />
-    <ClCompile Include="unpack.cpp" />
-    <ClCompile Include="volume.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="archive.hpp" />
-    <ClInclude Include="array.hpp" />
-    <ClInclude Include="blake2s.hpp" />
-    <ClInclude Include="cmddata.hpp" />
-    <ClInclude Include="coder.hpp" />
-    <ClInclude Include="compress.hpp" />
-    <ClInclude Include="consio.hpp" />
-    <ClInclude Include="crc.hpp" />
-    <ClInclude Include="crypt.hpp" />
-    <ClInclude Include="dll.hpp" />
-    <ClInclude Include="encname.hpp" />
-    <ClInclude Include="errhnd.hpp" />
-    <ClInclude Include="extinfo.hpp" />
-    <ClInclude Include="extract.hpp" />
-    <ClInclude Include="filcreat.hpp" />
-    <ClInclude Include="file.hpp" />
-    <ClInclude Include="filefn.hpp" />
-    <ClInclude Include="filestr.hpp" />
-    <ClInclude Include="find.hpp" />
-    <ClInclude Include="getbits.hpp" />
-    <ClInclude Include="global.hpp" />
-    <ClInclude Include="hash.hpp" />
-    <ClInclude Include="headers.hpp" />
-    <ClInclude Include="headers5.hpp" />
-    <ClInclude Include="isnt.hpp" />
-    <ClInclude Include="list.hpp" />
-    <ClInclude Include="loclang.hpp" />
-    <ClInclude Include="log.hpp" />
-    <ClInclude Include="match.hpp" />
-    <ClInclude Include="model.hpp" />
-    <ClInclude Include="openmpt-callback.hpp" />
-    <ClInclude Include="openmpt.hpp" />
-    <ClInclude Include="options.hpp" />
-    <ClInclude Include="os.hpp" />
-    <ClInclude Include="pathfn.hpp" />
-    <ClInclude Include="qopen.hpp" />
-    <ClInclude Include="rar.hpp" />
-    <ClInclude Include="rardefs.hpp" />
-    <ClInclude Include="rarlang.hpp" />
-    <ClInclude Include="raros.hpp" />
-    <ClInclude Include="rartypes.hpp" />
-    <ClInclude Include="rarvm.hpp" />
-    <ClInclude Include="rawread.hpp" />
-    <ClInclude Include="rdwrfn.hpp" />
-    <ClInclude Include="recvol.hpp" />
-    <ClInclude Include="resource.hpp" />
-    <ClInclude Include="rijndael.hpp" />
-    <ClInclude Include="rs.hpp" />
-    <ClInclude Include="rs16.hpp" />
-    <ClInclude Include="savepos.hpp" />
-    <ClInclude Include="scantree.hpp" />
-    <ClInclude Include="secpassword.hpp" />
-    <ClInclude Include="sha1.hpp" />
-    <ClInclude Include="sha256.hpp" />
-    <ClInclude Include="smallfn.hpp" />
-    <ClInclude Include="strfn.hpp" />
-    <ClInclude Include="strlist.hpp" />
-    <ClInclude Include="suballoc.hpp" />
-    <ClInclude Include="system.hpp" />
-    <ClInclude Include="threadpool.hpp" />
-    <ClInclude Include="timefn.hpp" />
-    <ClInclude Include="ulinks.hpp" />
-    <ClInclude Include="unicode.hpp" />
-    <ClInclude Include="unpack.hpp" />
-    <ClInclude Include="version.hpp" />
-    <ClInclude Include="volume.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
+	<ItemGroup Label="ProjectConfigurations">
+		<ProjectConfiguration Include="DebugLib|Win32">
+			<Configuration>DebugLib</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="DebugLib|x64">
+			<Configuration>DebugLib</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="NormalLib|Win32">
+			<Configuration>NormalLib</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="NormalLib|x64">
+			<Configuration>NormalLib</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseLib|Win32">
+			<Configuration>ReleaseLib</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseLib|x64">
+			<Configuration>ReleaseLib</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
+		<RootNamespace>UnRAR</RootNamespace>
+		<Keyword>Win32Proj</Keyword>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<UseDebugLibraries>true</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<UseDebugLibraries>true</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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'">UnRAR</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'">UnRAR64</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'">UnRAR</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'">UnRAR64</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'">UnRAR</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'">UnRAR64</TargetName>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>true</MinimalRebuild>
+			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>true</MinimalRebuild>
+			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<DebugInformationFormat>OldStyle</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>....
 
[truncated message content]

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

[<sag...@us...>]

Revision: 3052
          http://sourceforge.net/p/modplug/code/3052
Author:   saga-games
Date:     2013-10-26 20:34:44 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
[Fix] Fix building of 64-bit MIDI Input/Output plugin, removed superfluous machine type switch in mptrack compiler settings.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-10-26 19:35:27 UTC (rev 3051)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-10-26 20:34:44 UTC (rev 3052)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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="Debug|Win32">
@@ -101,7 +101,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;dsound.lib;msacm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Debug/mptrack.exe</OutputFile>
       <Version>5.0</Version>
@@ -162,7 +162,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <Version>5.0</Version>
@@ -226,7 +226,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;dsound.lib;msacm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <Version>5.0</Version>

Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj	2013-10-26 19:35:27 UTC (rev 3051)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj	2013-10-26 20:34:44 UTC (rev 3052)
@@ -64,14 +64,14 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\bin\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\bin\build\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\bin\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\bin\build\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\bin\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\bin\build\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\bin\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\bin\build\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
     <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EmbedManifest>
@@ -126,6 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -183,6 +184,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<sag...@us...>]

Revision: 3053
          http://sourceforge.net/p/modplug/code/3053
Author:   saga-games
Date:     2013-10-26 23:13:38 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
[Ref] Use new with std::nothrow in more places instead of exception handling since it's actually slightly more readable and more in style with the surrounding code in those cases.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Autotune.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/soundlib/load_j2b.cpp

Modified: trunk/OpenMPT/mptrack/Autotune.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/mptrack/Autotune.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -109,11 +109,9 @@
 	{
 		delete[] sampleData;
 	}
-	try
+	sampleData = new (std::nothrow) int8[sampleLength];
+	if(sampleData == nullptr)
 	{
-		sampleData = new int8[sampleLength];
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -309,12 +309,9 @@
 
 			if ((szPath[0]) && (!lstrcmpi(szPath, pszDllPath)))
 			{
-				VSTPluginLib *p;
-				try
+				VSTPluginLib *p = new (std::nothrow) VSTPluginLib(pszDllPath);
+				if(p == nullptr)
 				{
-					p = new VSTPluginLib(pszDllPath);
-				} catch(MPTMemoryException)
-				{
 					return nullptr;
 				}
 				_splitpath(pszDllPath, nullptr, nullptr, p->szLibraryName, nullptr);
@@ -368,12 +365,9 @@
 	HINSTANCE hLib;
 	bool validPlug = false;
 
-	VSTPluginLib *p;
-	try
+	VSTPluginLib *p = new (std::nothrow) VSTPluginLib(pszDllPath);
+	if(p == nullptr)
 	{
-		p = new VSTPluginLib(pszDllPath);
-	} catch(MPTMemoryException)
-	{
 		return nullptr;
 	}
 	_splitpath(pszDllPath, nullptr, nullptr, p->szLibraryName, nullptr);

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -1701,11 +1701,9 @@
 	}
 #endif
 
-	try
+	pIns = new (std::nothrow) ModInstrument();
+	if(pIns == nullptr)
 	{
-		pIns = new ModInstrument();
-	} catch(MPTMemoryException)
-	{
 		return FALSE;
 	}
 

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -141,13 +141,9 @@
 		
 		// Loading Instrument
 
-		ModInstrument *pIns;
-
-		try
+		ModInstrument *pIns = new (std::nothrow) ModInstrument(nSample);
+		if(pIns == nullptr)
 		{
-			pIns = new ModInstrument(nSample);
-		} catch(MPTMemoryException)
-		{
 			return false;
 		}
 		 
@@ -254,13 +250,9 @@
 	}
 	if (m_nInstruments < targetInstr) m_nInstruments = targetInstr;
 
-	ModInstrument *pIns;
-
-	try
+	ModInstrument *pIns = new (std::nothrow) ModInstrument();
+	if(pIns == nullptr)
 	{
-		pIns = new ModInstrument();
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 
@@ -720,7 +712,6 @@
 	GF1PATCHFILEHEADER *phdr = (GF1PATCHFILEHEADER *)lpStream;
 	GF1INSTRUMENT *pih = (GF1INSTRUMENT *)(lpStream+sizeof(GF1PATCHFILEHEADER));
 	GF1LAYER *plh = (GF1LAYER *)(lpStream+sizeof(GF1PATCHFILEHEADER)+sizeof(GF1INSTRUMENT));
-	ModInstrument *pIns;
 	DWORD dwMemPos = sizeof(GF1PATCHFILEHEADER)+sizeof(GF1INSTRUMENT)+sizeof(GF1LAYER);
 	UINT nSamples;
 
@@ -731,11 +722,9 @@
 	 || (!pih->layers) || (!plh->samples)) return false;
 	if (nInstr > m_nInstruments) m_nInstruments = nInstr;
 
-	try
+	ModInstrument *pIns = new (std::nothrow) ModInstrument();
+	if(pIns == nullptr)
 	{
-		pIns = new ModInstrument();
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 
@@ -874,13 +863,9 @@
 		return false;
 	}
 
-	ModInstrument *pIns;
-
-	try
+	ModInstrument *pIns = new (std::nothrow) ModInstrument();
+	if(pIns == nullptr)
 	{
-		pIns = new ModInstrument();
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 
@@ -1496,13 +1481,9 @@
 	}
 	if(nInstr > GetNumInstruments()) m_nInstruments = nInstr;
 
-	ModInstrument *pIns;
-
-	try
+	ModInstrument *pIns = new (std::nothrow) ModInstrument();
+	if(pIns == nullptr)
 	{
-		pIns = new ModInstrument();
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 
@@ -2170,12 +2151,9 @@
 
 	// Convert sample data to signed 32-Bit integer array.
 	const SmpLength numSamples = sample.nLength * sample.GetNumChannels();
-	FLAC__int32 *sampleData;
-	try
+	FLAC__int32 *sampleData = new (std::nothrow) FLAC__int32[numSamples];
+	if(sampleData == nullptr)
 	{
-		sampleData = new FLAC__int32[numSamples];
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -974,15 +974,13 @@
 	// Allocate with some overhead (16 bytes before sample start, and at least 16 bytes after that)
 	const size_t allocSize = (nbytes + 39) & ~7;
 
-	try
+	char *p = new (std::nothrow) char[allocSize];
+	if(p != nullptr)
 	{
-		char *p = new char[allocSize];
 		memset(p, 0, allocSize);
 		return (p + 16);
-	} catch(MPTMemoryException)
-	{
-		return nullptr;
 	}
+	return nullptr;
 }
 
 

Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp	2013-10-26 20:34:44 UTC (rev 3052)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp	2013-10-26 23:13:38 UTC (rev 3053)
@@ -1015,13 +1015,10 @@
 	}
 
 	// Header is valid, now unpack the RIFF AM file using inflate
-	Bytef *amFileData;
 	uLongf destSize = fileHeader.unpackedLength;
-	try
+	Bytef *amFileData = new (std::nothrow) Bytef[destSize];
+	if(amFileData == nullptr)
 	{
-		amFileData = new Bytef[destSize];
-	} catch(MPTMemoryException)
-	{
 		return false;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[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]

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

[<sag...@us...>]

Revision: 3063
          http://sourceforge.net/p/modplug/code/3063
Author:   saga-games
Date:     2013-11-01 23:33:00 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
[Mod] Updated release notes.
[Mod] OpenMPT: Version is now 1.22.06.00

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/packageTemplate/History.txt
    trunk/OpenMPT/packageTemplate/OMPT_1.22_ReleaseNotes.html

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2013-11-01 16:29:11 UTC (rev 3062)
+++ trunk/OpenMPT/common/versionNumber.h	2013-11-01 23:33:00 UTC (rev 3063)
@@ -16,8 +16,8 @@
 //Version definitions. The only thing that needs to be changed when changing version number.
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
-#define VER_MINOR               05
-#define VER_MINORMINOR          08
+#define VER_MINOR               06
+#define VER_MINORMINOR          00
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt	2013-11-01 16:29:11 UTC (rev 3062)
+++ trunk/OpenMPT/packageTemplate/History.txt	2013-11-01 23:33:00 UTC (rev 3063)
@@ -25,26 +25,80 @@
    <ks>    coda       / Ken Snyder
 
 
+v1.22.06.00 (2 November 2013, revision 3063)
+--------------------------------------------
+Pattern Tab::Note Properties
+   [Fix] <js> IT / S3M volume slide mapping was a bit off.
+
+Tree view
+   [Fix] <js> Note-off on key-up was accidentally also applied to the lower part of the tree view.
+
+VST / DMO Plugins
+   [Imp] <js> Audio is longer paused while a plugin is loaded.
+   [Fix] <js> SysEx messages are sent to plugins in a different way now. This fixes SysEx messages sent through OpenMPT's MIDI Input / Output plugin.
+
+MPTM::Loading
+   [Fix] <js> Loading MPTM files made with older versions of OpenMPT could trash some Parameter Control parameters.
+   [Fix] <js> Reading extended instrument and song properties in files with no samples was broken for the I-don't-know-how-manieth-time (also applies to IT files).
+
+IT::Compatible Playback Mode
+   [Fix] <js> In Compatible Gxx mode, sliding between two different samples shouldn't switch to the new sample (like in XM).
+
+XM::Loading
+   [Imp] <js> Don't enable smooth ramping heuristic for old XM revisions (this feature was introduced in a later version of Fasttracker 2).
+
+MOD::Loading
+   [Imp] <js> When loading SoundTracker modules, automatically enable ProTracker 1.x mode.
+   [Imp] <js> Re-enabled support for ADPCM-compressed samples.
+
+Other formats
+   [Imp] <js> Updated RAR unpacker. All RAR formats up to the current RAR 5.0 are now supported.
+   [Imp] <js> DBM: Support for panning envelopes, 32-bit samples, pattern names, multiple songs and various other small improvements.
+   [Imp] <js> Added support for AMS (Velvet Studio) format revision 2.0.
+   [Fix] <js> AMS (Velvet Studio): Default speed and tempo broke in OpenMPT 1.22.03.00. Instrument fadeout was too quick. Vibrato Envelope is now imported more correctly.
+   [Fix] <js> AMS (Extreme's Tracker): 16-bit sample support was broken.
+   [Fix] <js> DSM: Fixed broken patterns and added support for delta-encoded samples.
+   [Fix] <jh> Loading some malformed files in various format could lead to a crash (introduced in OpenMPT 1.22.03.00).
+   [Fix] <jh> WAV Loader: Loading 24-/32-bit WAV files as module crashed since (introduced in OpenMPT 1.22.04.00, http://bugs.openmpt.org/view.php?id=436).
+
+Misc
+   [New] <jh> Added support for Kernel Streaming sound output on Windows XP and for WaveRT on Vista or newer. Both drivers are listed as "WDM-KS" in the soundcard options dialog.
+   [New] <jh> Added a button to re-enumerate sound devices to soundcard options dialog. This allows selecting sound devices that got added / installed while OpenMPT was already running.
+   [New] <jh> Use a common dialog for WAV and compressed exporting. Support for FLAC (built-in), OGG and Opus added.
+   [New] <jh> WAV export also supports tags now.
+   [New] <jh> Can now also normalize audio during compressed export (via temporary file).
+   [New] <js> Added option to clean output buffers of plugins before exporting (renders up to 20 seconds of silence per plugin, http://bugs.openmpt.org/view.php?id=19).
+   [New] <jh> Added option to disable cue point writing on pattern transitions in WAV export (http://forum.openmpt.org/index.php?topic=5131.0).
+   [New] <js> Added command-line option /fullMemDump to write a minidump with heap when OpenMPT crashes.
+   [Imp] <jh> Removed static limit of 16 DirectSound and 8 ASIO devices.
+   [Imp] <jh> Limit WFIR cutoff setting to a sensible range.
+   [Mod] <jh> Calculate mixer channel statistics over the interval as maximum used channels instead of a approximation of average used channels.
+   [Mod] <jh> Remove /wavex command line option (not relevant anymore on any of the supported Windows versions)
+   [Mod] <jh> Always default or fallback to a Wave Out device which is by far the most stable and has the least suprising user experience.
+   [Mod] <jh> Slightly changed audio thread code to avoid sporadic deadlocks in Wine.
+   [Fix] <jh> All Loaders: When loading modules from a ZIP file, no longer overwrite existing song comments with ZIP file comments (broke in OpenMPT 1.22.02.00).
+
+
 v1.22.05.00 (31 August 2013, revision 2622)
 -------------------------------------------
 General Tab
-   [Imp] <js> Effect parameters are now also updated while dragging the corresponding slider (tx madbrain).
+   [Imp] <js> Plugin parameters are now also updated while dragging the corresponding slider (tx madbrain).
 
 Sample Editor
    [Imp] <js> Don't limit size of loaded sample file to the size of physical memory (old code relict).
 
 Instrument Editor
-   [Imp] <js> Also show FLAC files when loading instruments in instrument view.
+   [Imp] <js> FLAC files are also shown in the file selection dialog.
 
 Tree view
    [New] <js> Can now drag and drop samples / instruments between modules (tx madbrain).
    [Imp] <js> Releasing note keys now also stops sample / instrument previews (tx madbrain).
-   [Fix] <js> Previewing sound font instruments in the treeview broke in OpenMPT 1.22.04.00.
+   [Fix] <js> Previewing sound font instruments in the treeview broke in OpenMPT 1.22.04.00 (http://bugs.openmpt.org/view.php?id=429).
    [Fix] <js> Trying to rename items that are not part of a song folder crashed the application.
    [Fix] <js> Adding and renaming sequences didn't update the tree view properly.
 
 Playback
-   [Fix] <js> Fine / extra fine portamento slides in IT / S3M with a parameter of 0 were broken in OpenMPT 1.22.04.00.
+   [Fix] <js> Fine / extra fine portamento slides in IT / S3M with a parameter of 0 were broken in OpenMPT 1.22.04.00 (http://bugs.openmpt.org/view.php?id=433).
 
 Other formats
    [Fix] <jh> DSM: Support files that start with a slightly different header than usual DSM files (http://forum.openmpt.org/index.php?topic=5091).
@@ -71,7 +125,7 @@
    [Fix] <jh> Reduce quantization noise by correcting the rounding and scaling in floating point conversion and float or 24-/32-Bit normalization when loading such WAV samples.
 
 Tree view
-   [Imp] <js> Can now load more than 64 soundfonts.
+   [Imp] <js> Can now load more than 64 soundfonts (http://bugs.openmpt.org/view.php?id=333).
    [Fix] <js> Fixed a rare crash when switching between previewed files in tree view (probably present since OpenMPT 1.22.01).
    [Fix] <js> Fixed various issues with editing sequence / instrument / pattern names.
 

Modified: trunk/OpenMPT/packageTemplate/OMPT_1.22_ReleaseNotes.html
===================================================================
--- trunk/OpenMPT/packageTemplate/OMPT_1.22_ReleaseNotes.html	2013-11-01 16:29:11 UTC (rev 3062)
+++ trunk/OpenMPT/packageTemplate/OMPT_1.22_ReleaseNotes.html	2013-11-01 23:33:00 UTC (rev 3063)
@@ -114,11 +114,12 @@
             Old buffer length settings are <strong>converted automatically</strong> to their new equivalent values.
             Yes, the new latency value is higher than the previous buffer length value, but that is intended, because previously, the real latency was three times the buffer length.
             If you are still in doubt, read the <a href="http://wiki.openmpt.org/Manual:_Frequently_Asked_Questions#OpenMPT_produces_clicks_at_a_buffer_length_that_previously_worked_just_fine">FAQ</a>.</li>
-        <li>Added support for <strong>WASAPI output devices</strong>.</li>
+        <li>Added support for <strong>WASAPI, Kernel Streaming and WaveRT output devices</strong>. The latter two are displayed as WDM-KS in the GUI.</li>
         <li>Added a global <strong>VU meter with clip indicator</strong> in the main toolbar.</li>
         <li><strong>Elapsed time display</strong> in the status bar is a lot more accurate now (no more rounding errors that pile up over time).</li>
         <li>S9F (reverse sample) next to a note also works with looped samples now.</li>
         <li>Extra-smooth ramping is now also applied with no and linear interpolation.</li>
+        <li>The WAV and MP3 <strong>export dialogs</strong>> have been combined into a single new export dialog. Support for Opus, OGG Vorbis and FLAC have been added as export options.</li> 
     </ul>
 
     <div class="screenshots">
@@ -144,6 +145,7 @@
     
     <h3>Plugins</h3>
     <ul>
+        <li>Added an option to the export dialog to render a bit of silence before exporting (e.g. for faulty plugins that don't clear their reverb buffers when they are reset).</li>
         <li>It is now possible to <strong>load and save FXB</strong> (plugin preset bank) files.</li>
         <li>Plugin presets can now be <strong>copied and pasted</strong> between several instances of the same plugin.</li>
         <li>Added an option in the plugin editor to <strong>route a plugin's MIDI output</strong> to the pattern / sample / instrument editor.</li>
@@ -157,9 +159,11 @@
 
     <h3>File Format Support</h3>
     <ul>
+        <li>Libraries have been updated to support more versions of the <strong>LHA and RAR archive formats</strong>.</li>
         <li>Support for importing <strong>MP3 samples</strong> has been added. libmpeg123 is required for this to work, which is not shipped with MP3 due to the patent troubles involved with MP3 technology. The OpenMPT manual <a href="http://wiki.openmpt.org/Manual:_Frequently_Asked_Questions#I_can.27t_load_any_MP3_samples">explains</a> where to download and where to put libmpg123 to work with OpenMPT.</li>
         <li>Drastically improved support for 15-sample <strong>SoundTracker MODs</strong>!</li>
-        <li>Experimental support for <strong>saving IT-compressed samples</strong> has been added. Compressed stereo samples won't load in older versions of OpenMPT, and compressed samples will cause trouble when reading extended song or instrument properties in old versions, so be careful if you want to be backwards-compatible.</li>
+        <li>Support for <strong>saving IT-compressed samples</strong> has been added. Compressed stereo samples won't load in older versions of OpenMPT, and compressed samples will cause trouble when reading extended song or instrument properties in old versions, so be careful if you want to be backwards-compatible. Thus, compressed samples are not enabled by default.</li>
+        <li>Improved support for DBM (DigiBooster Pro), DSM (DSIK) and AMS (Velvet Studio) modules.</li>
         <li>Added support for <strong>DIGI</strong> (DigiBooster) modules.</li>
         <li>Advanced <strong>tracker detection</strong>: OpenMPT tries to find out which tracker a file was made with and shows this information in the "Last saved with" field in the Song Properties.</li>
     </ul>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3074
          http://sourceforge.net/p/modplug/code/3074
Author:   manxorist
Date:     2013-11-04 18:22:26 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
merge branch settings. Merge is done by hand without recording svn mergeinfo. 'svn diff https://svn.code.sf.net/p/modplug/code/trunk/OpenMPT@3041 https://svn.code.sf.net/p/modplug/code/branches/manx/settings@3041' is applied to a trunk checkout of r3041 which is then updated to HEAD and then commited (svn gets somehow confused when using svn merge):
........
[Ref] Add a new type-aware and caching settings framework.
[Ref] Convert all raw ini file reading/writing to the new settings framework.
[Ref] Speedup configuration setting handling by only writing dirty values when closing OpenMPT.
[New] Add an advanced options panel (still needs a bunch of usability improvements).
........
[Ref] Load settings before constructing CMainFrame.
........
[Fix] Actually properly initialize plugin cache.
........
[Ref] Construct settings framework instances not until we know the pathnames.
........
[Imp] settings: Support multiple backends.
[New] settings: Add (read-only) registry backend.
[Ref] settings: Add registry backend fallback for old ini versions.
........
[Fix] settings: Add a SettingValue(const char*) overload, so that string literals do not get converted to bool values.
........
[Ref] settings: Split TrackerDirectories from TrackerSetttings (for now), to break circular dependencies between initializing paths and loading the settings.
[Ref] settings: Remove global static TrackerSettings instance and construct it at the right moment (after instanciating the SettingsContainer).
[Ref] settings: Move default initialisation of dynamic setting defaults into TrackerSettings constructor.
........
[Ref] settings: Convert version, install GUID and splash screen handling to Setting<T>.
........
[Ref] settings: Move LoadSettings() directly after construction of TrackerSettings.
........
[Ref] settings: Move loop song setting where it belongs.
........
[Imp] settings: Support differing key names between current ini file and old registry.
........
[Ref] settings: Convert "Display" section to Setting<T>.
........
[Ref] settings: Convert "MIDI Settings" to Setting<T>.
[Ref] settings: Add CachedSetting<T> with weaker consistency semantics.
........
[Fix] settings: Correct VU meter key name (broken in r2715 ).
........
[Fix] settings: VuMeterUpdateInterval should be cached.
[Ref] settings: Small tunings.
........
[Ref] settings: Convert "Misc" section to Setting<T>.
........
[Imp] settings: Update instances of CachedSetting<T> via change notification callbacks.
[Ref] settings: Minor tunings.
........
[Ref] settings: Support uint8 settings.
[Ref] settings: float settings could as well be doubles.
[Ref] settings: Add Setting<T>::GetPath().
........
[Ref] settings: Convert most of "Sound Settings" section to Setting<T>.
........
[Fix] settings: Fix rounding of FIR cutoff.
........
[Ref] settings: Add an explicit type for binary setting values. This makes proting old binary registry settings easier and avoids the need to re-implement the WIN32 ini file binary structure encoding.
........
[Ref] Do not get current output samplerate and sampleformat from global TrackerSeetings. Instead, pass around the current device settings directly from the SoundDevice callbacks. The device itself knows best what it is set up to.
........
[Ref] settings: Convert most of section "Pattern Editor" to Setting<T>.
........
[Ref] Small cleanup.
........
[Ref] settings: Convert section "Sample Editor" to Setting<T>.
........
[Ref] settings: Call LoadSettings() in TrackerSettings constructor.
[Ref] settings: Make LoadBarState and SaveBarState symmetric.
[Ref] settings: Destroy registry backend directly after importing old settings.
........
[Fix] settings: Call LoadSettings() in TrackerSettings constructor.
........
[Ref] settings: Convert "Effects" section to conf.Read() / conf.Write().
[Ref] settings: Move code around a bit.
........
[Fix] Avoid constructing CAutoSaver with uninitialized members.
[Ref] settings: Convert "AutoSave" section to conf.Read() / conf.Write().
........
[Ref] settings: Convert "Display"/Colors to conf.Read() / conf.Write() .
........
[Ref] settings: Convert old maximized window setting to Setting<T>.
........
[Ref] settings: Convert section "Paths" to conf.Read() / conf.Write() .
[Ref] settings: Kill TrackerSettings::LoadRegistrySettings() . 
........
[Ref] settings: Kill TrackerSettings::LoadINISettings() .
........
[Ref] settings: Do not store default values twice.
[Ref] settings: Uninline ReadSetting(),WriteSetting(),RemoveSetting() functions.
........
[Fix] settings: VS2008 does not support std::map::at(), use find() as a work-around.
........
[Ref] settings: Simplify code.
........
[Ref] settings: Simplify code.
........
[Ref] settings: Make usage of SettingPath more readable at the usage site by using an explicit OldSettingPath helper structure when the old setting path differs.
........
[Ref] Avoid touching TrackerSettings in CMainFrame::DoNotification().
........
[Fix] settings: Make testcases compile again.
........
[Imp] settings: Make settings framework handle unicode strings.
[Mod] settings: Convert/force mptrack.ini into UTF16 encoding (this is backwards compatible because even ANSI versions of WIN32 ini file functions handle the converted file correctly).
[Ref] Add an explicit string type mpt::PathString for path and filenames which is either std::wstring (on windows) or std::string (elsewhere) and provide explicit encoding conversion functions.
........
[Ref] settings: Small cleanups.
........
[Fix] VS2008 compile fix.
........
[Ref] settings: Make immediate-flush mode a runtime option.
........
[Ref] settings: Add missing operator %= .
........
[Mod] settings: Convert any ini file to unicode only on demand (i.e. if a non-ansi-representable string gets written).
........
[Ref] settings: Convert remaining UNREFERENCED_PARAMETER to MPT_UNREFERENCED_PARAMETER.
........
[Imp] settings: Add a warning message to advanceds settings tab.
........
[Fix] settings: Make advanced settings listbox not sorted. The data is already sorted and this confuses indexing.
[Fix] settings: ReInit advanced settings tab when activated.
........
[Ref] settings: Remove #define MPT_SETTINGS_PANEL .
........
[Ref] settings: Inline TrackerSettings::LoadSettings() into constructor.
[Ref] settings: Small related cleanups.
........
[Ref] sounddev: Move defaults solely into SoundDeviceSettings default constructor.
........
[Ref] sounddev: Move defaults solely into SoundDeviceSettings default constructor.
........
[Fix] settings: Fix uninitialized variable.
[Fix] settings: Make !MPT_SETTINGS_CACHE compile again.
........
[Ref] settings: Un-inline unimported functions.
[Fix] settings: Make !MPT_SETTINGS_CACHE always hold values locally instead of reading them on every access.
........
[Fix] settings: Do not write changes immediately if !MPT_SETTINGS_CACHE.
........
[Fix] Fix mismerge of r2904 in r2906 .
........
[Ref] settings: Cleanup.
........
[Ref] settings: Add some comments, documenting the general idea of Setting.h .
........
[Ref] settings: Move translation of ancient setting paths to a single function.
........
[Mod] settings: Remove support for importing registry based settings from older versions ( < "1.17.02.40").
[Fix] settings: Do not assume version 0 if settings file is missing.
........
[Ref] settings: Add copy contructor for Setting<T> which is useful syntax to use in some corner cases.
[Ref] settings: Add SettingValue converters to/from float.
........

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/3041
    http://sourceforge.net/p/modplug/code/2715
    http://sourceforge.net/p/modplug/code/2904
    http://sourceforge.net/p/modplug/code/2906

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.h
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/AutoSaver.cpp
    trunk/OpenMPT/mptrack/AutoSaver.h
    trunk/OpenMPT/mptrack/Childfrm.cpp
    trunk/OpenMPT/mptrack/Ctrl_com.h
    trunk/OpenMPT/mptrack/Ctrl_gen.cpp
    trunk/OpenMPT/mptrack/Ctrl_gen.h
    trunk/OpenMPT/mptrack/Ctrl_ins.h
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/mptrack/Ctrl_pat.h
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.h
    trunk/OpenMPT/mptrack/EffectVis.h
    trunk/OpenMPT/mptrack/Globals.h
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Mod2wave.cpp
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Moptions.h
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
    trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
    trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/mptrack/Undo.cpp
    trunk/OpenMPT/mptrack/UpdateCheck.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/dlg_misc.h
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
    trunk/OpenMPT/mptrack/resource.h
    trunk/OpenMPT/sounddev/SoundDevice.h
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/test/test.cpp

Added Paths:
-----------
    trunk/OpenMPT/mptrack/Settings.cpp
    trunk/OpenMPT/mptrack/Settings.h

Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/common/misc_util.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -38,6 +38,18 @@
 template<> inline std::string Stringify(const signed char& x) { return Stringify((signed int)x); }
 template<> inline std::string Stringify(const unsigned char& x) { return Stringify((unsigned int)x); }
 
+template<class T>
+inline std::wstring StringifyW(const T& x)
+//----------------------------------------
+{
+	std::wostringstream o;
+	if(!(o << x)) return L"FAILURE";
+	else return o.str();
+}
+
+template<> inline std::wstring StringifyW(const signed char& x) { return StringifyW((signed int)x); }
+template<> inline std::wstring StringifyW(const unsigned char& x) { return StringifyW((unsigned int)x); }
+
 //Convert string to number.
 template<class T>
 inline T ConvertStrTo(const char *str)
@@ -52,6 +64,13 @@
 		return static_cast<T>(atof(str));
 }
 
+template<class T>
+inline T ConvertStrTo(const std::string &str)
+//-------------------------------------------
+{
+	return ConvertStrTo<T>(str.c_str());
+}
+
 #if MPT_COMPILER_MSVC
 #define cxx11_strtoll  _strtoi64
 #define cxx11_strtoull _strtoui64
@@ -59,14 +78,26 @@
 #define cxx11_strtoll  std::strtoll
 #define cxx11_strtoull std::strtoull
 #endif
+template<> inline bool           ConvertStrTo(const char *str) {return std::strtol(str, nullptr, 10) ? true : false;}
+template<> inline signed char      ConvertStrTo(const char *str) {return (signed char)std::strtol(str, nullptr, 10);}
+template<> inline signed short     ConvertStrTo(const char *str) {return (signed short)std::strtol(str, nullptr, 10);}
 template<> inline signed int       ConvertStrTo(const char *str) {return (signed int)std::strtol(str, nullptr, 10);}
 template<> inline signed long      ConvertStrTo(const char *str) {return std::strtol(str, nullptr, 10);}
 template<> inline signed long long ConvertStrTo(const char *str) {return cxx11_strtoll(str, nullptr, 10);}
+template<> inline unsigned char      ConvertStrTo(const char *str) {return (unsigned char)std::strtoul(str, nullptr, 10);}
+template<> inline unsigned short     ConvertStrTo(const char *str) {return (unsigned short)std::strtoul(str, nullptr, 10);}
 template<> inline unsigned int       ConvertStrTo(const char *str) {return (unsigned int)std::strtoul(str, nullptr, 10);}
 template<> inline unsigned long      ConvertStrTo(const char *str) {return std::strtoul(str, nullptr, 10);}
 template<> inline unsigned long long ConvertStrTo(const char *str) {return cxx11_strtoull(str, nullptr, 10);}
 
+template<class T>
+inline T ConvertStrTo(const std::wstring &str)
+//--------------------------------------------
+{
+	return ConvertStrTo<T>(mpt::String::Encode(str, mpt::CharsetLocale));
+}
 
+
 // Memset given object to zero.
 template <class T>
 inline void MemsetZero(T &a)

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/common/mptString.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -160,5 +160,26 @@
 } // namespace String
 
 
+#if defined(WIN32)
+typedef std::wstring PathString;
+#define MPT_PATHSTRING(lit) L##lit
+static inline std::string PathToLocale(const PathString &path) { return mpt::String::Encode(path, mpt::CharsetLocale); }
+static inline std::string PathToUTF8(const PathString &path)   { return mpt::String::Encode(path, mpt::CharsetUTF8);   }
+static inline std::wstring PathToWide(const PathString &path)  { return path; }
+static inline PathString LocaleToPath(const std::string &path) { return mpt::String::Decode(path, mpt::CharsetLocale); }
+static inline PathString UTF8ToPath(const std::string &path)   { return mpt::String::Decode(path, mpt::CharsetUTF8);   }
+static inline PathString WideToPath(const std::wstring &path)  { return path; }
+#else // !WIN32
+typedef std::string PathString;
+#define MPT_PATHSTRING(lit) lit
+static inline std::string PathToLocale(const PathString &path) { return path; }
+static inline std::string PathToUTF8(const PathString &path)   { return mpt::String::Convert(path, mpt::CharsetLocale, mpt::CharsetUTF8); }
+static inline std::wstring PathToWide(const PathString &path)  { return mpt::String::Decode(path, mpt::CharsetLocale); }
+static inline PathString LocaleToPath(const std::string &path) { return path; }
+static inline PathString UTF8ToPath(const std::string &path)   { return mpt::String::Convert(path, mpt::CharsetUTF8, mpt::CharsetLocale); }
+static inline PathString WideToPath(const std::wstring &path)  { return mpt::String::Encode(path, mpt::CharsetLocale); }
+#endif // WIN32
+
+
 } // namespace mpt
 

Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -28,10 +28,6 @@
 // Construction/Destruction
 ///////////////////////////
 
-CAutoSaver::CAutoSaver() : m_bSaveInProgress(false)
-{
-}
-
 CAutoSaver::CAutoSaver(bool enabled, int saveInterval, int backupHistory,
 					   bool useOriginalPath, CString path, CString fileNameTemplate) :
 	m_bSaveInProgress(false)
@@ -45,7 +41,7 @@
 	m_csFileNameTemplate = fileNameTemplate;
 }
 
-CAutoSaver::~CAutoSaver(void)
+CAutoSaver::~CAutoSaver()
 {
 }
 

Modified: trunk/OpenMPT/mptrack/AutoSaver.h
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/AutoSaver.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -9,6 +9,7 @@
 
 
 #pragma once
+
 #include "resource.h"
 
 class CModDoc;
@@ -17,10 +18,9 @@
 {
 public:
 //Cons/Destr
-	CAutoSaver(void);
-	CAutoSaver(bool enabled, int saveInterval, int backupHistory,
-			   bool useOriginalPath, CString path, CString fileNameTemplate);
-	~CAutoSaver(void);
+	CAutoSaver(bool enabled=true, int saveInterval=10, int backupHistory=3,
+			   bool useOriginalPath=true, CString path="", CString fileNameTemplate="");
+	~CAutoSaver();
 	
 //Work
 	bool DoSave(DWORD curTime);
@@ -28,6 +28,7 @@
 //Member access
 	void Enable();
 	void Disable();
+	void SetEnabled(bool enabled) { if(enabled) Enable(); else Disable(); }
 	bool IsEnabled();
 	void SetUseOriginalPath(bool useOrgPath);
 	bool GetUseOriginalPath();
@@ -62,7 +63,6 @@
 	CString m_csFileNameTemplate;
 
 };
-#pragma once
 
 
 // CAutoSaverGUI dialog

Modified: trunk/OpenMPT/mptrack/Childfrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Childfrm.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -92,7 +92,7 @@
 {
 	if ((--glMdiOpenCount) == 0)
 	{
-		TrackerSettings::Instance().gbMdiMaximize = m_bMaxWhenClosed;
+		TrackerSettings::Instance().gbMdiMaximize = (m_bMaxWhenClosed != 0);
 	}
 }
 
@@ -245,7 +245,7 @@
 		CRect rect;
 		
 		m_bMaxWhenClosed = IsZoomed();
-		if (bForce) TrackerSettings::Instance().gbMdiMaximize = m_bMaxWhenClosed;
+		if (bForce) TrackerSettings::Instance().gbMdiMaximize = (m_bMaxWhenClosed != 0);
 		if (!IsIconic())
 		{
 			CWnd *pWnd = m_wndSplitter.GetPane(0, 0);

Modified: trunk/OpenMPT/mptrack/Ctrl_com.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_com.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -21,7 +21,7 @@
 
 public:
 	CCtrlComments(CModControlView &parent, CModDoc &document);
-	LONG* GetSplitPosRef() {return &TrackerSettings::Instance().glCommentsWindowHeight;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return &TrackerSettings::Instance().glCommentsWindowHeight;} 	//rewbs.varWindowSize
 
 public:
 	//{{AFX_DATA(CCtrlComments)

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -505,7 +505,7 @@
 void CCtrlGeneral::OnLoopSongChanged()
 //------------------------------------
 {
-	TrackerSettings::Instance().gbLoopSong = IsDlgButtonChecked(IDC_CHECK_LOOPSONG);
+	TrackerSettings::Instance().gbLoopSong = (IsDlgButtonChecked(IDC_CHECK_LOOPSONG) != 0);
 	m_sndFile.SetRepeatCount((TrackerSettings::Instance().gbLoopSong) ? -1 : 0);
 }
 

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -45,7 +45,7 @@
 {
 public:
 	CCtrlGeneral(CModControlView &parent, CModDoc &document);
-	LONG* GetSplitPosRef() {return &TrackerSettings::Instance().glGeneralWindowHeight;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return &TrackerSettings::Instance().glGeneralWindowHeight;} 	//rewbs.varWindowSize
 
 private:
 	void setAsDecibels(LPSTR stringToSet, double value, double valueAtZeroDB);

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -128,7 +128,7 @@
 	BOOL OpenInstrument(CSoundFile &sndFile, INSTRUMENTINDEX nInstr);
 	BOOL EditSample(UINT nSample);
 	VOID UpdateFilterText();
-	LONG* GetSplitPosRef() {return &TrackerSettings::Instance().glInstrumentWindowHeight;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return &TrackerSettings::Instance().glInstrumentWindowHeight;} 	//rewbs.varWindowSize
 
 public:
 	//{{AFX_VIRTUAL(CCtrlInstruments)

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -449,7 +449,7 @@
 	case CTRLMSG_SETRECORD:
 		if (lParam >= 0) m_bRecord = (BOOL)(lParam); else m_bRecord = !m_bRecord;
 		m_ToolBar.SetState(IDC_PATTERN_RECORD, ((m_bRecord) ? TBSTATE_CHECKED : 0)|TBSTATE_ENABLED);
-		TrackerSettings::Instance().gbPatternRecord = m_bRecord;
+		TrackerSettings::Instance().gbPatternRecord = (m_bRecord != 0);
 		SendViewMessage(VIEWMSG_SETRECORD, m_bRecord);
 		break;
 
@@ -943,7 +943,7 @@
 {
 	UINT nState = m_ToolBar.GetState(IDC_PATTERN_RECORD);
 	m_bRecord = ((nState & TBSTATE_CHECKED) != 0);
-	TrackerSettings::Instance().gbPatternRecord = m_bRecord;
+	TrackerSettings::Instance().gbPatternRecord = (m_bRecord != 0);
 	SendViewMessage(VIEWMSG_SETRECORD, m_bRecord);
 	SwitchToView();
 }
@@ -954,7 +954,7 @@
 {
 	UINT nState = m_ToolBar.GetState(ID_PATTERN_VUMETERS);
 	m_bVUMeters = ((nState & TBSTATE_CHECKED) != 0);
-	TrackerSettings::Instance().gbPatternVUMeters = m_bVUMeters;
+	TrackerSettings::Instance().gbPatternVUMeters = (m_bVUMeters != 0);
 	SendViewMessage(VIEWMSG_SETVUMETERS, m_bVUMeters);
 	SwitchToView();
 }
@@ -965,7 +965,7 @@
 {
 	UINT nState = m_ToolBar.GetState(ID_VIEWPLUGNAMES);
 	m_bPluginNames = ((nState & TBSTATE_CHECKED) != 0);
-	TrackerSettings::Instance().gbPatternPluginNames = m_bPluginNames;
+	TrackerSettings::Instance().gbPatternPluginNames = (m_bPluginNames != 0);
 	SendViewMessage(VIEWMSG_SETPLUGINNAMES, m_bPluginNames);
 	SwitchToView();
 }

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -193,7 +193,7 @@
 
 public:
 	CCtrlPatterns(CModControlView &parent, CModDoc &document);
-	LONG* GetSplitPosRef() {return &TrackerSettings::Instance().glPatternWindowHeight;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return &TrackerSettings::Instance().glPatternWindowHeight;} 	//rewbs.varWindowSize
 
 public:
 	void SetCurrentPattern(PATTERNINDEX nPat);

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -389,7 +389,7 @@
 	}
 	SetCurrentSample((lParam > 0) ? ((SAMPLEINDEX)lParam) : m_nSample);
 
-	m_nFinetuneStep = (uint16)GetPrivateProfileInt("Sample Editor", "FinetuneStep", 25, theApp.GetConfigFileName());
+	m_nFinetuneStep = (uint16)theApp.GetSettings().Read<int32>("Sample Editor", "FinetuneStep", 25);
 
 	// Initial Update
 	if (!m_bInitialized) UpdateView((m_nSample << HINT_SHIFT_SMP) | HINT_SAMPLEINFO | HINT_MODTYPE, NULL);
@@ -1027,7 +1027,7 @@
 	mpt::String::SetNullTerminator(szFileName);
 	SanitizeFilename(szFileName);
 
-	CString format = CMainFrame::GetPrivateProfileCString("Sample Editor", "DefaultFormat", defaultFLAC ? "flac" : "wav", theApp.GetConfigFileName());
+	CString format = theApp.GetSettings().Read<CString>("Sample Editor", "DefaultFormat", defaultFLAC ? "flac" : "wav");
 	int filter = 1;
 	if(!format.CompareNoCase("flac"))
 		filter = 2;

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -69,7 +69,7 @@
 	bool SetCurrentSample(SAMPLEINDEX nSmp, LONG lZoom = -1, bool bUpdNum = true);
 	bool OpenSample(LPCSTR lpszFileName);
 	bool OpenSample(const CSoundFile &sndFile, SAMPLEINDEX nSample);
-	LONG* GetSplitPosRef() {return &TrackerSettings::Instance().glSampleWindowHeight;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return &TrackerSettings::Instance().glSampleWindowHeight;} 	//rewbs.varWindowSize
 
 public:
 	//{{AFX_VIRTUAL(CCtrlSamples)

Modified: trunk/OpenMPT/mptrack/EffectVis.h
===================================================================
--- trunk/OpenMPT/mptrack/EffectVis.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/EffectVis.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -116,7 +116,7 @@
 	BOOL OpenEditor(CWnd *parent);
 	VOID DoClose();
 	afx_msg void OnClose();
-	LONG* GetSplitPosRef() {return NULL;} 	//rewbs.varWindowSize
+	Setting<LONG>* GetSplitPosRef() {return NULL;} 	//rewbs.varWindowSize
 
 	CViewPattern *m_pViewPattern;
 	

Modified: trunk/OpenMPT/mptrack/Globals.h
===================================================================
--- trunk/OpenMPT/mptrack/Globals.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Globals.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -68,7 +68,7 @@
 	void LockControls() { m_nLockCount++; }
 	void UnlockControls() { PostMessage(WM_MOD_UNLOCKCONTROLS); }
 	bool IsLocked() const { return (m_nLockCount > 0); }
-	virtual LONG* GetSplitPosRef() = 0; 	//rewbs.varWindowSize
+	virtual Setting<LONG>* GetSplitPosRef() = 0; 	//rewbs.varWindowSize
 
 protected:
 	//{{AFX_VIRTUAL(CModControlDlg)

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -208,8 +208,6 @@
 	MemsetZero(g_csAudio);
 	InitializeCriticalSection(&g_csAudio);
 
-	TrackerSettings::Instance().LoadSettings();
-
 	m_InputHandler = new CInputHandler(this); 	//rewbs.customKeys
 
 	//Loading static tunings here - probably not the best place to do that but anyway.
@@ -244,14 +242,14 @@
 		// Fall back to default WaveOut device
 		TrackerSettings::Instance().m_nWaveDevice = SoundDeviceID();
 	}
-	if(TrackerSettings::Instance().m_MixerSettings.gdwMixingFreq == 0)
+	if(TrackerSettings::Instance().MixerSamplerate == 0)
 	{
-		TrackerSettings::Instance().m_MixerSettings.gdwMixingFreq = MixerSettings().gdwMixingFreq;
+		TrackerSettings::Instance().MixerSamplerate = MixerSettings().gdwMixingFreq;
 		#ifndef NO_ASIO
 			// If no mixing rate is specified and we're using ASIO, get a mixing rate supported by the device.
-			if(TrackerSettings::Instance().m_nWaveDevice.GetType() == SNDDEV_ASIO)
+			if(TrackerSettings::Instance().GetSoundDeviceID().GetType() == SNDDEV_ASIO)
 			{
-				TrackerSettings::Instance().m_MixerSettings.gdwMixingFreq = theApp.GetSoundDevicesManager()->GetDeviceCaps(TrackerSettings::Instance().m_nWaveDevice, TrackerSettings::Instance().GetSampleRates(), CMainFrame::GetMainFrame(), CMainFrame::GetMainFrame()->gpSoundDevice).currentSampleRate;
+				TrackerSettings::Instance().MixerSamplerate = theApp.GetSoundDevicesManager()->GetDeviceCaps(TrackerSettings::Instance().m_nWaveDevice, TrackerSettings::Instance().GetSampleRates(), CMainFrame::GetMainFrame(), CMainFrame::GetMainFrame()->gpSoundDevice).currentSampleRate;
 			}
 		#endif // NO_ASIO
 	}
@@ -462,8 +460,9 @@
 
 	// Save Settings
 	RemoveControlBar(&m_wndStatusBar); // Remove statusbar so that its state won't get saved.
+	SaveBarState("Toolbars");
+	AddControlBar(&m_wndStatusBar); // Restore statusbar to mainframe.
 	TrackerSettings::Instance().SaveSettings();
-	AddControlBar(&m_wndStatusBar); // Restore statusbar to mainframe.
 
 	if(m_InputHandler && m_InputHandler->activeCommandSet)
 	{
@@ -475,79 +474,8 @@
 }
 
 
-bool CMainFrame::WritePrivateProfileBool(const CString section, const CString key, const bool value, const CString iniFile)
-{
-	CHAR valueBuffer[INIBUFFERSIZE];
-	wsprintf(valueBuffer, "%li", value?1:0);
-	return (WritePrivateProfileString(section, key, valueBuffer, iniFile) != 0);
-}
 
 
-bool CMainFrame::GetPrivateProfileBool(const CString section, const CString key, const bool defaultValue, const CString iniFile)
-{
-	CHAR defaultValueBuffer[INIBUFFERSIZE];
-	wsprintf(defaultValueBuffer, "%li", defaultValue?1:0);
-
-	CHAR valueBuffer[INIBUFFERSIZE];
-	GetPrivateProfileString(section, key, defaultValueBuffer, valueBuffer, INIBUFFERSIZE, iniFile);
-
-	return atol(valueBuffer)?true:false;
-}
-
-
-bool CMainFrame::WritePrivateProfileLong(const CString section, const CString key, const long value, const CString iniFile)
-{
-	CHAR valueBuffer[INIBUFFERSIZE];
-	wsprintf(valueBuffer, "%li", value);
-	return (WritePrivateProfileString(section, key, valueBuffer, iniFile) != 0);
-}
-
-
-long CMainFrame::GetPrivateProfileLong(const CString section, const CString key, const long defaultValue, const CString iniFile)
-{
-	CHAR defaultValueBuffer[INIBUFFERSIZE];
-	wsprintf(defaultValueBuffer, "%li", defaultValue);
-
-	CHAR valueBuffer[INIBUFFERSIZE];
-	GetPrivateProfileString(section, key, defaultValueBuffer, valueBuffer, INIBUFFERSIZE, iniFile);
-
-	return ConvertStrTo<long>(valueBuffer);
-}
-
-
-bool CMainFrame::WritePrivateProfileDWord(const CString section, const CString key, const DWORD value, const CString iniFile)
-{
-	CHAR valueBuffer[INIBUFFERSIZE];
-	wsprintf(valueBuffer, "%lu", value);
-	return (WritePrivateProfileString(section, key, valueBuffer, iniFile) != 0);
-}
-
-DWORD CMainFrame::GetPrivateProfileDWord(const CString section, const CString key, const DWORD defaultValue, const CString iniFile)
-{
-	CHAR defaultValueBuffer[INIBUFFERSIZE];
-	wsprintf(defaultValueBuffer, "%lu", defaultValue);
-
-	CHAR valueBuffer[INIBUFFERSIZE];
-	GetPrivateProfileString(section, key, defaultValueBuffer, valueBuffer, INIBUFFERSIZE, iniFile);
-	return ConvertStrTo<uint32>(valueBuffer);
-}
-
-bool CMainFrame::WritePrivateProfileCString(const CString section, const CString key, const CString value, const CString iniFile)
-{
-	return (WritePrivateProfileString(section, key, value, iniFile) != 0);
-}
-
-CString CMainFrame::GetPrivateProfileCString(const CString section, const CString key, const CString defaultValue, const CString iniFile)
-{
-	CHAR defaultValueBuffer[INIBUFFERSIZE];
-	strcpy(defaultValueBuffer, defaultValue);
-	CHAR valueBuffer[INIBUFFERSIZE];
-	GetPrivateProfileString(section, key, defaultValueBuffer, valueBuffer, INIBUFFERSIZE, iniFile);
-	return valueBuffer;
-}
-
-
-
 LRESULT CALLBACK CMainFrame::KeyboardProc(int code, WPARAM wParam, LPARAM lParam)
 //-------------------------------------------------------------------------------
 {
@@ -841,7 +769,7 @@
 	{
 		return true;
 	}
-	if(TrackerSettings::Instance().m_MixerSettings.IsValid())
+	if(TrackerSettings::Instance().GetMixerSettings().IsValid())
 	{
 		if(audioTryOpeningDevice())
 		{
@@ -1031,7 +959,7 @@
 		notification.masterVU[1] = rVu;
 		if(gnClipLeft) notification.masterVU[0] |= Notification::ClipVU;
 		if(gnClipRight) notification.masterVU[1] |= Notification::ClipVU;
-		uint32 dwVuDecay = Util::muldiv(dwSamplesRead, 120000, TrackerSettings::Instance().m_MixerSettings.gdwMixingFreq) + 1;
+		uint32 dwVuDecay = Util::muldiv(dwSamplesRead, 120000, m_pSndFile->m_MixerSettings.gdwMixingFreq) + 1;
 
 		if (lVu >= dwVuDecay) gnLVuMeter = (lVu - dwVuDecay) << 11; else gnLVuMeter = 0;
 		if (rVu >= dwVuDecay) gnRVuMeter = (rVu - dwVuDecay) << 11; else gnRVuMeter = 0;
@@ -1060,7 +988,7 @@
 #ifndef NO_EQ
 	sndFile.SetEQGains(TrackerSettings::Instance().m_EqSettings.Gains, MAX_EQ_BANDS, TrackerSettings::Instance().m_EqSettings.Freqs, reset?TRUE:FALSE);
 #endif
-	sndFile.SetDspEffects(TrackerSettings::Instance().m_MixerSettings.DSPMask);
+	sndFile.SetDspEffects(TrackerSettings::Instance().MixerDSPMask);
 	sndFile.InitPlayer(reset?TRUE:FALSE);
 }
 
@@ -1070,11 +998,11 @@
 {
 	CriticalSection cs;
 	if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_MUTECHNMODE)
-		TrackerSettings::Instance().m_MixerSettings.MixerFlags |= SNDMIX_MUTECHNMODE;
+		TrackerSettings::Instance().MixerFlags |= SNDMIX_MUTECHNMODE;
 	else
-		TrackerSettings::Instance().m_MixerSettings.MixerFlags &= ~SNDMIX_MUTECHNMODE;
-	sndFile.SetMixerSettings(TrackerSettings::Instance().m_MixerSettings);
-	sndFile.SetResamplerSettings(TrackerSettings::Instance().m_ResamplerSettings);
+		TrackerSettings::Instance().MixerFlags &= ~SNDMIX_MUTECHNMODE;
+	sndFile.SetMixerSettings(TrackerSettings::Instance().GetMixerSettings());
+	sndFile.SetResamplerSettings(TrackerSettings::Instance().GetResamplerSettings());
 	UpdateDspEffects(sndFile, false); // reset done in next line
 	sndFile.InitPlayer(reset?TRUE:FALSE);
 }
@@ -1202,8 +1130,8 @@
 void CMainFrame::SetPreAmp(UINT n)
 //--------------------------------
 {
-	TrackerSettings::Instance().m_MixerSettings.m_nPreAmp = n;
-	if (m_pSndFile) m_pSndFile->SetPreAmp(TrackerSettings::Instance().m_MixerSettings.m_nPreAmp);
+	TrackerSettings::Instance().MixerPreAmp = n;
+	if (m_pSndFile) m_pSndFile->SetPreAmp(TrackerSettings::Instance().MixerPreAmp);
 }
 
 
@@ -1636,7 +1564,7 @@
 //------------------------------------------------------------------------------------------------
 {
 	const bool isPlaying = IsPlaying();
-	if((TrackerSettings::Instance().m_nWaveDevice != deviceID) || (TrackerSettings::Instance().GetSoundDeviceSettings() != deviceSettings))
+	if((TrackerSettings::Instance().GetSoundDeviceID() != deviceID) || (TrackerSettings::Instance().GetSoundDeviceSettings() != deviceSettings))
 	{
 		CModDoc *pActiveMod = NULL;
 		if (isPlaying)
@@ -1644,7 +1572,7 @@
 			if ((m_pSndFile) && (!m_pSndFile->IsPaused())) pActiveMod = GetModPlaying();
 			PauseMod();
 		}
-		TrackerSettings::Instance().m_nWaveDevice = deviceID;
+		TrackerSettings::Instance().SetSoundDeviceID(deviceID);
 		TrackerSettings::Instance().SetSoundDeviceSettings(deviceSettings);
 		{
 			CriticalSection cs;
@@ -1687,9 +1615,9 @@
 //---------------------------------
 {
 	if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_MUTECHNMODE)
-		TrackerSettings::Instance().m_MixerSettings.MixerFlags |= SNDMIX_MUTECHNMODE;
+		TrackerSettings::Instance().MixerFlags |= SNDMIX_MUTECHNMODE;
 	else
-		TrackerSettings::Instance().m_MixerSettings.MixerFlags &= ~SNDMIX_MUTECHNMODE;
+		TrackerSettings::Instance().MixerFlags &= ~SNDMIX_MUTECHNMODE;
 	{
 		CriticalSection cs;
 		if(GetSoundFilePlaying()) UpdateAudioParameters(*GetSoundFilePlaying());
@@ -1823,6 +1751,9 @@
 #endif
 	CAutoSaverGUI autosavedlg(m_pAutoSaver); //rewbs.AutoSaver
 	CUpdateSetupDlg updatedlg;
+#if defined(MPT_SETTINGS_CACHE)
+	COptionsAdvanced advanced;
+#endif // MPT_SETTINGS_CACHE
 	dlg.AddPage(&general);
 	dlg.AddPage(&sounddlg);
 	dlg.AddPage(&playerdlg);
@@ -1834,6 +1765,9 @@
 	dlg.AddPage(&mididlg);
 	dlg.AddPage(&autosavedlg);
 	dlg.AddPage(&updatedlg);
+#if defined(MPT_SETTINGS_CACHE)
+	dlg.AddPage(&advanced);
+#endif // MPT_SETTINGS_CACHE
 	m_bOptionsLocked=true;	//rewbs.customKeys
 	m_SoundCardOptionsDialog = &sounddlg;
 	dlg.DoModal();
@@ -2526,10 +2460,9 @@
 	{
 		firstShow = false;
 		WINDOWPLACEMENT wpl;
-		if (GetPrivateProfileStruct("Display", "WindowPlacement", &wpl, sizeof(WINDOWPLACEMENT), theApp.GetConfigFileName()))
-		{
-			SetWindowPlacement(&wpl);
-		}
+		GetWindowPlacement(&wpl);
+		wpl = theApp.GetSettings().Read<WINDOWPLACEMENT>("Display", "WindowPlacement", wpl);
+		SetWindowPlacement(&wpl);
 	}
 }
 

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -247,6 +247,14 @@
 #include "TrackerSettings.h"
 struct MODPLUGDIB;
 
+template<> inline SettingValue ToSettingValue(const WINDOWPLACEMENT &val) {
+	return SettingValue(EncodeBinarySetting<WINDOWPLACEMENT>(val), "WINDOWPLACEMENT");
+}
+template<> inline WINDOWPLACEMENT FromSettingValue(const SettingValue &val) {
+	ASSERT(val.GetTypeTag() == "WINDOWPLACEMENT");
+	return DecodeBinarySetting<WINDOWPLACEMENT>(val.as<std::vector<char> >());
+}
+
 //======================================================================================
 class CMainFrame: public CMDIFrameWnd, public ISoundSource, public ISoundMessageReceiver
 //======================================================================================
@@ -357,16 +365,6 @@
 	static CInputHandler *m_InputHandler; 	//rewbs.customKeys
 	static CAutoSaver *m_pAutoSaver; 		//rewbs.customKeys
 
-	static bool WritePrivateProfileBool(const CString section, const CString key, const bool value, const CString iniFile);
-	static bool GetPrivateProfileBool(const CString section, const CString key, const bool defaultValue, const CString iniFile);
-	static bool WritePrivateProfileLong(const CString section, const CString key, const long value, const CString iniFile);
-	static long GetPrivateProfileLong(const CString section, const CString key, const long defaultValue, const CString iniFile);
-	static bool WritePrivateProfileDWord(const CString section, const CString key, const DWORD value, const CString iniFile);
-	static DWORD GetPrivateProfileDWord(const CString section, const CString key, const DWORD defaultValue, const CString iniFile);
-	static bool WritePrivateProfileCString(const CString section, const CString key, const CString value, const CString iniFile);
-	static CString GetPrivateProfileCString(const CString section, const CString key, const CString defaultValue, const CString iniFile);
-
-
 	// Misc functions
 public:
 	void SetUserText(LPCSTR lpszText);

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -738,7 +738,7 @@
 	}
 
 	MixerSettings oldmixersettings = m_pSndFile->m_MixerSettings;
-	MixerSettings mixersettings = TrackerSettings::Instance().m_MixerSettings;
+	MixerSettings mixersettings = TrackerSettings::Instance().GetMixerSettings();
 	mixersettings.m_nMaxMixChannels = MAX_CHANNELS; // always use max mixing channels when rendering
 	mixersettings.gdwMixingFreq = samplerate;
 	mixersettings.gnChannels = channels;
@@ -754,7 +754,7 @@
 
 	m_pSndFile->ResetChannels();
 	m_pSndFile->SetMixerSettings(mixersettings);
-	m_pSndFile->SetResamplerSettings(TrackerSettings::Instance().m_ResamplerSettings);
+	m_pSndFile->SetResamplerSettings(TrackerSettings::Instance().GetResamplerSettings());
 	m_pSndFile->InitPlayer(TRUE);
 	if ((!m_dwFileLimit) || (m_dwFileLimit > 2047*1024)) m_dwFileLimit = 2047*1024; // 2GB
 	m_dwFileLimit <<= 10;

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -15,6 +15,8 @@
 #include "mainfrm.h"
 #include "moptions.h"
 #include "moddoc.h"
+#include "Settings.h"
+#include "dlg_misc.h"
 
 
 //////////////////////////////////////////////////////////////
@@ -492,11 +494,14 @@
 
 	// Ensure that all colours are reset (for outdated colour schemes)
 	OnPresetMPT();
-	for(int i = 0; i < MAX_MODCOLORS; i++)
 	{
-		TCHAR sKeyName[16];
-		wsprintf(sKeyName, "Color%02d", i);
-		CustomColors[i] = CMainFrame::GetPrivateProfileLong("Colors", sKeyName, CustomColors[i], files.first_file.c_str());
+		IniFileSettingsContainer file(mpt::LocaleToPath(files.first_file));
+		for(int i = 0; i < MAX_MODCOLORS; i++)
+		{
+			TCHAR sKeyName[16];
+			wsprintf(sKeyName, "Color%02d", i);
+			CustomColors[i] = file.Read<int32>("Colors", sKeyName, CustomColors[i]);
+		}
 	}
 	OnPreviewChanged();
 }
@@ -507,13 +512,16 @@
 	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "mptcolor", "",
 		"OpenMPT Color Schemes|*.mptcolor||",
 		theApp.GetConfigPath());
-	if(files.abort) return;
-
-	for(int i = 0; i < MAX_MODCOLORS; i++)
+	if(files.abort)
+		return;
 	{
-		TCHAR sKeyName[16];
-		wsprintf(sKeyName, "Color%02d", i);
-		CMainFrame::WritePrivateProfileLong("Colors", sKeyName, CustomColors[i], files.first_file.c_str());
+		IniFileSettingsContainer file(mpt::LocaleToPath(files.first_file));
+		for(int i = 0; i < MAX_MODCOLORS; i++)
+		{
+			TCHAR sKeyName[16];
+			wsprintf(sKeyName, "Color%02d", i);
+			file.Write<int32>("Colors", sKeyName, CustomColors[i]);
+		}
 	}
 }
 
@@ -678,3 +686,91 @@
 	}
 	SetDlgItemText(IDC_TEXT1, (pszDesc) ? pszDesc : "");
 }
+
+
+
+#if defined(MPT_SETTINGS_CACHE)
+
+BEGIN_MESSAGE_MAP(COptionsAdvanced, CPropertyPage)
+	ON_LBN_DBLCLK(IDC_LIST4,					OnOptionDblClick)
+END_MESSAGE_MAP()
+
+void COptionsAdvanced::DoDataExchange(CDataExchange* pDX)
+//-------------------------------------------------------
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CModTypeDlg)
+	DDX_Control(pDX, IDC_LIST4,			m_List);
+	//}}AFX_DATA_MAP
+}
+
+
+static std::string FormatSetting(const SettingPath &path, const SettingValue &val)
+//--------------------------------------------------------------------------------
+{
+	return path.FormatAsString() + " = " + mpt::String::Encode(val.FormatAsString(), mpt::CharsetLocale);
+}
+
+
+BOOL COptionsAdvanced::OnInitDialog()
+//-----------------------------------
+{
+	CPropertyPage::OnInitDialog();
+	ReInit();
+	return TRUE;
+}
+
+
+void COptionsAdvanced::ReInit()
+//-----------------------------
+{
+	m_List.ResetContent();
+	m_IndexToPath.clear();
+	for(SettingsContainer::SettingsMap::const_iterator it = theApp.GetSettings().begin(); it != theApp.GetSettings().end(); ++it)
+	{
+		int index = m_List.AddString(FormatSetting(it->first, it->second).c_str());
+		m_IndexToPath[index] = it->first;
+	}
+}
+
+
+void COptionsAdvanced::OnOK()
+//---------------------------
+{
+	CPropertyPage::OnOK();
+}
+
+
+BOOL COptionsAdvanced::OnSetActive()
+//----------------------------------
+{
+	ReInit();
+	CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_ADVANCED;
+	return CPropertyPage::OnSetActive();
+}
+
+
+void COptionsAdvanced::OnOptionDblClick()
+//---------------------------------------
+{
+	const int index = m_List.GetCurSel();
+	if(m_IndexToPath.find(index) == m_IndexToPath.end())
+	{
+		return;
+	}
+	const SettingPath path = m_IndexToPath[index];
+	SettingValue val = theApp.GetSettings().GetMap().find(path)->second;
+	CInputDlg inputDlg(this, path.FormatAsString().c_str(), mpt::String::Encode(val.FormatValueAsString(), mpt::CharsetLocale).c_str());
+	if(inputDlg.DoModal() != IDOK)
+	{
+		return;
+	}
+	val.SetFromString(mpt::String::Decode(inputDlg.resultString.GetString(), mpt::CharsetLocale));
+	theApp.GetSettings().Write(path, val);
+	m_List.DeleteString(index);
+	m_List.InsertString(index, FormatSetting(path, val).c_str());
+	m_List.SetCurSel(index);
+	OnSettingsChanged();
+}
+
+#endif // MPT_SETTINGS_CACHE

Modified: trunk/OpenMPT/mptrack/Moptions.h
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.h	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Moptions.h	2013-11-04 18:22:26 UTC (rev 3074)
@@ -23,6 +23,7 @@
 	OPTIONS_PAGE_MIDI,
 	OPTIONS_PAGE_AUTOSAVE,
 	OPTIONS_PAGE_UPDATE,
+	OPTIONS_PAGE_ADVANCED,
 };
 
 
@@ -56,6 +57,35 @@
 };
 
 
+#if defined(MPT_SETTINGS_CACHE)
+
+//==========================================
+class COptionsAdvanced: public CPropertyPage
+//==========================================
+{
+protected:
+	CListBox m_List;
+	std::map<int, SettingPath> m_IndexToPath;
+
+public:
+	COptionsAdvanced():CPropertyPage(IDD_OPTIONS_ADVANCED) {}
+
+protected:
+	virtual BOOL OnInitDialog();
+	virtual void OnOK();
+	virtual BOOL OnSetActive();
+	virtual void DoDataExchange(CDataExchange* pDX);
+	afx_msg void OnOptionDblClick();
+	afx_msg void OnSettingsChanged() { SetModified(TRUE); }
+
+	void ReInit();
+
+	DECLARE_MESSAGE_MAP();
+};
+
+#endif // MPT_SETTINGS_CACHE
+
+
 //========================================
 class COptionsColors: public CPropertyPage
 //========================================

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -128,7 +128,7 @@
 	
 	CHAR s[128];
 
-	CheckDlgButton(IDC_CHECK2, (TrackerSettings::Instance().m_MixerSettings.MixerFlags & SNDMIX_SOFTPANNING) ? MF_CHECKED : MF_UNCHECKED);
+	CheckDlgButton(IDC_CHECK2, (TrackerSettings::Instance().MixerFlags & SNDMIX_SOFTPANNING) ? MF_CHECKED : MF_UNCHECKED);
 	CheckDlgButton(IDC_CHECK4, m_Settings.ExclusiveMode ? MF_CHECKED : MF_UNCHECKED);
 	CheckDlgButton(IDC_CHECK5, m_Settings.BoostThreadPriority ? MF_CHECKED : MF_UNCHECKED);
 
@@ -142,7 +142,7 @@
 		{
 			wsprintf(s, "%d (%s)", nCPUMix[n], szCPUNames[n]);
 			m_CbnPolyphony.AddString(s);
-			if (TrackerSettings::Instance().m_MixerSettings.m_nMaxMixChannels == nCPUMix[n]) m_CbnPolyphony.SetCurSel(n);
+			if (TrackerSettings::Instance().MixerMaxChannels == nCPUMix[n]) m_CbnPolyphony.SetCurSel(n);
 		}
 	}
 	// latency
@@ -188,7 +188,7 @@
 		m_SliderStereoSep.SetPos(2);
 		for (int n=0; n<=4; n++)
 		{
-			if ((int)TrackerSettings::Instance().m_MixerSettings.m_nStereoSeparation <= (int)(32 << n))
+			if ((int)TrackerSettings::Instance().MixerStereoSeparation <= (int)(32 << n))
 			{
 				m_SliderStereoSep.SetPos(n);
 				break;
@@ -371,9 +371,9 @@
 //---------------------------------------
 {
 	CHAR s[64];
-	TrackerSettings::Instance().m_MixerSettings.m_nStereoSeparation = 32 << m_SliderStereoSep.GetPos();
+	TrackerSettings::Instance().MixerStereoSeparation = 32 << m_SliderStereoSep.GetPos();
 	CMainFrame::GetMainFrame()->SetupPlayer();
-	wsprintf(s, "%d%%", (TrackerSettings::Instance().m_MixerSettings.m_nStereoSeparation * 100) / 128);
+	wsprintf(s, "%d%%", (TrackerSettings::Instance().MixerStereoSeparation * 100) / 128);
 	SetDlgItemText(IDC_TEXT1, s);
 
 }
@@ -382,7 +382,7 @@
 void COptionsSoundcard::SetPreAmpSliderPosition()
 //-----------------------------------------------
 {
-	int n = (TrackerSettings::Instance().m_MixerSettings.m_nPreAmp - 64) / 8;
+	int n = (TrackerSettings::Instance().MixerPreAmp - 64) / 8;
 	if ((n < 0) || (n > 40)) n = 16;
 	m_SliderPreAmp.SetPos(n);
 }
@@ -468,7 +468,10 @@
 void COptionsSoundcard::OnOK()
 //----------------------------
 {
-	if(IsDlgButtonChecked(IDC_CHECK2)) TrackerSettings::Instance().m_MixerSettings.MixerFlags |= SNDMIX_SOFTPANNING; else TrackerSettings::Instance().m_MixerSettings.MixerFlags &= ~SNDMIX_SOFTPANNING;
+	if(IsDlgButtonChecked(IDC_CHECK2))
+		TrackerSettings::Instance().MixerFlags = TrackerSettings::Instance().MixerFlags | SNDMIX_SOFTPANNING;
+	else
+		TrackerSettings::Instance().MixerFlags = TrackerSettings::Instance().MixerFlags & ~SNDMIX_SOFTPANNING;
 	m_Settings.ExclusiveMode = IsDlgButtonChecked(IDC_CHECK4) ? true : false;
 	m_Settings.BoostThreadPriority = IsDlgButtonChecked(IDC_CHECK5) ? true : false;
 	// Mixing Freq
@@ -494,7 +497,7 @@
 		int nmmx = m_CbnPolyphony.GetCurSel();
 		if ((nmmx >= 0) && (nmmx < CountOf(nCPUMix)))
 		{
-			TrackerSettings::Instance().m_MixerSettings.m_nMaxMixChannels = nCPUMix[nmmx];
+			TrackerSettings::Instance().MixerMaxChannels = nCPUMix[nmmx];
 			CMainFrame::GetMainFrame()->SetupPlayer();
 		}
 	}
@@ -606,7 +609,7 @@
 	DWORD dwQuality;
 
 	CPropertyPage::OnInitDialog();
-	dwQuality = TrackerSettings::Instance().m_MixerSettings.DSPMask;
+	dwQuality = TrackerSettings::Instance().MixerDSPMask;
 	// Resampling type
 	{
 		m_CbnResampling.AddString("No Interpolation");
@@ -616,7 +619,7 @@
 		m_CbnResampling.AddString("Polyphase");
 		m_CbnResampling.AddString("XMMS-ModPlug");
 		//end rewbs.resamplerConf
-		m_CbnResampling.SetCurSel(TrackerSettings::Instance().m_ResamplerSettings.SrcMode);
+		m_CbnResampling.SetCurSel(TrackerSettings::Instance().ResamplerMode);
 	}
 	// Effects
 #ifndef NO_DSP
@@ -704,10 +707,10 @@
 	OnResamplerChanged();
 
 	char s[16] = "";
-	_ltoa(TrackerSettings::Instance().m_MixerSettings.glVolumeRampUpSamples, s, 10);
+	_ltoa(TrackerSettings::Instance().MixerVolumeRampUpSamples, s, 10);
 	m_CEditRampUp.SetWindowText(s);
 
-	_ltoa(TrackerSettings::Instance().m_MixerSettings.glVolumeRampDownSamples, s, 10);
+	_ltoa(TrackerSettings::Instance().MixerVolumeRampDownSamples, s, 10);
 	m_CEditRampDown.SetWindowText(s);
 
 	//end rewbs.resamplerConf
@@ -744,7 +747,7 @@
 //rewbs.resamplerConf
 void COptionsPlayer::OnWFIRTypeChanged()
 {
-	TrackerSettings::Instance().m_ResamplerSettings.gbWFIRType = static_cast<BYTE>(m_CbnWFIRType.GetCurSel());
+	TrackerSettings::Instance().ResamplerSubMode = static_cast<BYTE>(m_CbnWFIRType.GetCurSel());
 	OnSettingsChanged();
 }
 
@@ -761,7 +764,7 @@
 		m_CbnWFIRType.SetCurSel(0);
 		m_CbnWFIRType.EnableWindow(FALSE);
 		m_CEditWFIRCutoff.EnableWindow(TRUE);
-		wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().m_ResamplerSettings.gdWFIRCutoff * 100)));
+		wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().ResamplerCutoffPercent)));
 		break;
 	case SRCMODE_FIRFILTER:
 		m_CbnWFIRType.AddString("Hann");
@@ -772,10 +775,10 @@
 		m_CbnWFIRType.AddString("Blackman 4 Tap 92");
 		m_CbnWFIRType.AddString("Blackman 4 Tap 74");
 		m_CbnWFIRType.AddString("Kaiser 4 Tap");
-		m_CbnWFIRType.SetCurSel(TrackerSettings::Instance().m_ResamplerSettings.gbWFIRType);
+		m_CbnWFIRType.SetCurSel(TrackerSettings::Instance().ResamplerSubMode);
 		m_CbnWFIRType.EnableWindow(TRUE);
 		m_CEditWFIRCutoff.EnableWindow(TRUE);
-		wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().m_ResamplerSettings.gdWFIRCutoff*100)));
+		wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().ResamplerCutoffPercent)));
 		break;
 	default:
 		m_CbnWFIRType.AddString("None");
@@ -865,23 +868,23 @@
 	m_CEditWFIRCutoff.GetWindowText(s);
 	if(s != "")
 	{
-		double newCutoff = atoi(s)/100.0;
-		Limit(newCutoff, 0.0, 1.0);
-		TrackerSettings::Instance().m_ResamplerSettings.gdWFIRCutoff = newCutoff;
+		int newCutoff = atoi(s);
+		Limit(newCutoff, 0, 100);
+		TrackerSettings::Instance().ResamplerCutoffPercent = newCutoff;
 	}
 	{
 		CHAR s[64];
-		wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().m_ResamplerSettings.gdWFIRCutoff*100)));
+		wsprintf(s, "%d", TrackerSettings::Instance().ResamplerCutoffPercent.Get());
 		m_CEditWFIRCutoff.SetWindowText(s);
 	}
 	//TrackerSettings::Instance().m_ResamplerSettings.gbWFIRType set in OnWFIRTypeChange
 
 	m_CEditRampUp.GetWindowText(s);
-	TrackerSettings::Instance().m_MixerSettings.glVolumeRampUpSamples = atol(s);
+	TrackerSettings::Instance().MixerVolumeRampUpSamples = atol(s);
 	m_CEditRampDown.GetWindowText(s);
-	TrackerSettings::Instance().m_MixerSettings.glVolumeRampDownSamples = atol(s);
-	TrackerSettings::Instance().m_ResamplerSettings.SrcMode = (ResamplingMode)dwSrcMode;
-	TrackerSettings::Instance().m_MixerSettings.DSPMask = dwQuality;
+	TrackerSettings::Instance().MixerVolumeRampDownSamples = atol(s);
+	TrackerSettings::Instance().ResamplerMode = (ResamplingMode)dwSrcMode;
+	TrackerSettings::Instance().MixerDSPMask = dwQuality;
 	CMainFrame::GetMainFrame()->SetupPlayer();
 	CPropertyPage::OnOK();
 }
@@ -1258,12 +1261,12 @@
 	static const struct
 	{
 		const char *text;
-		TrackerSettings::RecordAftertouchOptions option;
+		RecordAftertouchOptions option;
 	} aftertouchOptions[] =
 	{
-		{ "Do not record Aftertouch", TrackerSettings::atDoNotRecord },
-		{ "Record as Volume Commands", TrackerSettings::atRecordAsVolume },
-		{ "Record as MIDI Macros", TrackerSettings::atRecordAsMacro },
+		{ "Do not record Aftertouch", atDoNotRecord },
+		{ "Record as Volume Commands", atRecordAsVolume },
+		{ "Record as MIDI Macros", atRecordAsMacro },
 	};
 
 	for(size_t i = 0; i < CountOf(aftertouchOptions); i++)
@@ -1280,7 +1283,7 @@
 	SetDlgItemInt(IDC_EDIT3, TrackerSettings::Instance().midiVelocityAmp);
 	m_SpinAmp.SetRange(1, 10000);
 
-	SetDlgItemText(IDC_EDIT4, TrackerSettings::Instance().IgnoredCCsToString().c_str());
+	SetDlgItemText(IDC_EDIT4, IgnoredCCsToString(TrackerSettings::Instance().midiIgnoreCCs).c_str());
 
 	// Midi Import settings
 	SetDlgItemInt(IDC_EDIT1, TrackerSettings::Instance().midiImportSpeed);
@@ -1313,7 +1316,7 @@
 		if (n >= 0) m_nMidiDevice = combo->GetItemData(n);
 	}
 
-	TrackerSettings::Instance().aftertouchBehaviour = static_cast<TrackerSettings::RecordAftertouchOptions>(m_ATBehaviour.GetItemData(m_ATBehaviour.GetCurSel()));
+	TrackerSettings::Instance().aftertouchBehaviour = static_cast<RecordAftertouchOptions>(m_ATBehaviour.GetItemData(m_ATBehaviour.GetCurSel()));
 
 	TrackerSettings::Instance().midiImportSpeed = GetDlgItemInt(IDC_EDIT1);
 	TrackerSettings::Instance().midiImportPatternLen = GetDlgItemInt(IDC_EDIT2);
@@ -1321,7 +1324,7 @@
 
 	CString cc;
 	GetDlgItemText(IDC_EDIT4, cc);
-	TrackerSettings::Instance().ParseIgnoredCCs(cc);
+	TrackerSettings::Instance().midiIgnoreCCs = StringToIgnoredCCs(cc.GetString());
 
 	if (pMainFrm) pMainFrm->SetupMidi(m_dwMidiSetup, m_nMidiDevice);
 	CPropertyPage::OnOK();

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-04 17:35:11 UTC (rev 3073)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-04 18:22:26 UTC (rev 3074)
@@ -26,6 +26,7 @@
 #include "../common/StringFixer.h"
 #include "ExceptionHandler.h"
 #include "CloseMainDialog.h"
+#include "AutoSaver.h"
 
 // rewbs.memLeak
 #define _CRTDBG_MAP_ALLOC
@@ -305,23 +306,23 @@
 BOOL CTrackApp::ImportMidiConfig(LPCSTR lpszConfigFile, BOOL bNoWarn)
 //-------------------------------------------------------------------
 {
-	TCHAR szFileName[_MAX_PATH], s[_MAX_PATH], szUltraSndPath[_MAX_PATH];
+	if ((!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
 
-	if ((!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
 	if (!glpMidiLibrary)
 	{
 		glpMidiLibrary = new MIDILIBSTRUCT;
 		if (!glpMidiLibrary) return FALSE;
 		MemsetZero(*glpMidiLibrary);
 	}
+
 	if (CDLSBank::IsDLSBank(lpszConfigFile))
 	{
 		ConfirmAnswer result = cnfYes;
 		if (!bNoWarn)
 		{
 			result = Reporting::Confirm("You are about to replace the current MIDI library:\n"
-									"Do you want to replace only the missing instruments? (recommended)",
-									"Warning", true);
+				"Do you want to replace only the missing instruments? (recommended)",
+				"Warning", true);
 		}
 		if (result == cnfCancel) return FALSE;
 		const bool bReplaceAll = (result == cnfNo);
@@ -348,24 +349,41 @@
 		}
 		return TRUE;
 	}
-	GetPrivateProfileString(_T("Ultrasound"), _T("PatchDir"), _T(""), szUltraSndPath, CountOf(szUltraSndPath), lpszConfigFile);
+
+	IniFileSettingsContainer file(mpt::LocaleToPath(lpszConfigFile));
+	return ImportMidiConfig(file);
+}
+
+BOOL CTrackApp::ImportMidiConfig(SettingsContainer &file)
+//-------------------------------------------------------
+{
+	TCHAR szFileName[_MAX_PATH], s[_MAX_PATH], szUltraSndPath[_MAX_PATH];
+
+	if (!glpMidiLibrary)
+	{
+		glpMidiLibrary = new MIDILIBSTRUCT;
+		if (!glpMidiLibrary) return FALSE;
+		MemsetZero(*glpMidiLibrary);
+	}
+
+	mpt::String::Copy(szUltraSndPath, file.Read<std::string>("Ultrasound", "PatchDir", ""));
 	if (!strcmp(szUltraSndPath, _T(".\\"))) szUltraSndPath[0] = 0;
 	if (!szUltraSndPath[0]) GetCurrentDirectory(CountOf(szUltraSndPath), szUltraSndPath);
 	for (UINT iMidi=0; iMidi<256; iMidi++)
 	{
 		szFileName[0] = 0;
 		wsprintf(s, (iMidi < 128) ? _T("Midi%d") : _T("Perc%d"), iMidi & 0x7f);
-		GetPrivateProfileString(_T("Midi Library"), s, _T(""), szFileName, CountOf(szFileName), lpszConfigFile);
+		mpt::String::Copy(szFileName, file.Read<std::string>("Midi Library", s, ""));
 		// Check for ULTRASND.INI
 		if (!szFileName[0])
 		{
 			LPCSTR pszSection = (iMidi < 128) ? _T("Melodic Patches") : _T("Drum Patches");
 			wsprintf(s, _T("%d"), iMidi & 0x7f);
-			GetPrivateProfileString(pszSection, s, _T(""), szFileName, CountOf(szFileName), lpszConfigFile);
+			mpt::String::Copy(szFileName, file.Read<std::string>(pszSection, s, ""));
 			if (!szFileName[0])
 			{
 				pszSection = (iMidi < 128) ? _T("Melodic Bank 0") : _T("Drum Bank 0");
-				GetPrivateProfileString(pszSection, s, "", szFileName, CountOf(szFileName), lpszConfigFile);
+				mpt::String::Copy(szFileName, file.Read<std::string>(pszSection, s, ""));
 			}
 			if (szFileName[0])
 			{
@@ -398,9 +416,17 @@
 BOOL CTrackApp::ExportMidiConfig(LPCSTR lpszConfigFile)
 //-----------------------------------------------------
 {
+	if ((!glpMidiLibrary) || (!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
+	IniFileSettingsContainer file(mpt::LocaleToPath(lpszConfigFile));
+	return ExportMidiConfig(file);
+}
+
+BOOL CTrackApp::ExportMidiConfig(SettingsContainer &file)
+//-------------------------------------------------------
+{
 	TCHAR szFileName[_MAX_PATH], s[128];
 
-	if ((!glpMidiLibrary) || (!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
+	if (!glpMidiLibrary) return FALSE;
 	for(size_t iMidi = 0; iMidi < 256; iMidi++) if (glpMidiLibrary->MidiMap[iMidi])
 	{
 		if (iMidi < 128)
@@ -414,7 +440,7 @@
 		{
 			if(theApp.IsPortableMode())
 				theApp.AbsolutePathToRelative(szFileName);
-			if (!WritePrivateProfileString("Midi Library", s, szFileName, lpszConfigFile)) break;
+			file.Write<std::string>("Midi Library", s, szFileName);
 		}
 	}
 	return TRUE;
@@ -434,18 +460,18 @@
 	CHAR szFileName[MAX_PATH];
 	HKEY key;
 
-	CString storedVersion = CMainFrame::GetPrivateProfileCString("Version", "Version", "", theApp.GetConfigFileName());
+	CString storedVersion = theApp.GetSettings().Read<CString>("Version", "Version", "");
 	//If version number stored in INI is 1.17.02.40 or later, load DLS from INI file.
 	//Else load DLS from Registry
 	if (storedVersion >= "1.17.02.40")
 	{
 		CHAR s[MAX_PATH];
-		UINT numBanks = CMainFrame::GetPrivateProfileLong("DLS Banks", "NumBanks", 0, theApp.GetConfigFileName());
+		UINT numBanks = theApp.GetSettings().Read<int32>("DLS Banks", "NumBanks", 0);
 		for(size_t i = 0; i < numBanks; i++)
 		{
 			wsprintf(s, _T("Bank%d"), i + 1);
 			TCHAR szPath[_MAX_PATH];
-			GetPrivateProfileString("DLS Banks", s, "", szPath, INIBUFFERSIZE, theApp.GetConfigFileName());
+			mpt::String::Copy(szPath, theApp.GetSettings().Read<std::string>("DLS Banks", s, ""));
 			theApp.RelativePathToAbsolute(szPath);
 			AddDLSBank(szPath);
 		}
@@ -531,11 +557,11 @@
 		}
 
 		wsprintf(s, _T("Bank%d"), nBanks+1);
-		WritePrivateProfileString("DLS Banks", s, szPath, theApp.GetConfigFileName());
+		theApp.GetSettings().Write<std::string>("DLS Banks", s, szPath);
 		nBanks++;
 
 	}
-	CMainFrame::WritePrivateProfileLong("DLS Banks", "NumBanks", nBanks, theApp.GetConfigFileName());
+	theApp.GetSettings().Write<int32>("DLS Banks", "NumBanks", nBanks);
 	return TRUE;
 }
 
@@ -610,6 +636,10 @@
 
 CTrackApp::CTrackApp()
 //--------------------
+	: m_pSettingsIniFile(nullptr)
+	, m_pSettings(nullptr)
+	, m_pTrackerSettings(nullptr)
+	, m_pPluginCache(nullptr)
 {
 	#if MPT_COMPILER_MSVC
 		_CrtSetDebugFillThreshold(0); // Disable buffer filling in secure enhanced CRT functions.
@@ -623,6 +653,7 @@
 	m_pSoundDevicesManager = nullptr;
 	m_bInitialized = FALSE;
 	m_szConfigFileName[0] = 0;
+	m_szPluginCacheFileName[0] = 0;
 }
 
 
@@ -719,11 +750,11 @@
 	// Create tunings dir
 	CString sTuningPath;
 	sTuningPath.Format(TEXT("%stunings\\"), m_szConfigDirectory);
-	TrackerSettings::Instance().SetDefaultDirectory(sTuningPath, DIR_TUNING);
+	TrackerDirectories::Instance().SetDefaultDirectory(sTuningPath, DIR_TUNING);
 
-	if(PathIsDirectory(TrackerSettings::Instance().GetDefaultDirectory(DIR_TUNING)) == 0)
+	if(PathIsDirectory(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)) == 0)
 	{
-		CreateDirectory(TrackerSettings::Instance().GetDefaultDirectory(DIR_TUNING), 0);
+		CreateDirectory(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING), 0);
 	}
 
 	if(!bIsAppDir)
@@ -763,8 +794,15 @@
 	TCHAR szTemplatePath[MAX_PATH];
 	_tcscpy(szTemplatePath, m_szConfigDirectory);
 	_tcscat(szTemplatePath, _T("TemplateModules\\"));
-	TrackerSettings::Instance().SetDefaultDirectory(szTemplatePath, DIR_TEMPLATE_FILES_USER);
+	TrackerDirectories::Instance().SetDefaultDirectory(szTemplatePath, DIR_TEMPLATE_FILES_USER);
 
+	//Force use of custom ini file rather than windowsDir\executableName.ini
+	if(m_pszProfileName)
+	{
+		free((void *)m_pszProfileName);
+	}
+	m_pszProfileName = _tcsdup(m_szConfigFileName);
+
 	m_bPortableMode = bIsAppDir;
 }
 
@@ -781,18 +819,10 @@
 	// Start loading
 	BeginWaitCursor();
 
-	MEMORYSTATUS gMemStatus;
-	MemsetZero(gMemStatus);
-	GlobalMemoryStatus(&gMemStatus);
-#if 0
-	Log("Physical: %lu\n", gMemStatus.dwTotalPhys);
-	Log("Page File: %lu\n", gMemStatus.dwTotalPageFile);
-	Log("Virtual: %lu\n", gMemStatus.dwTotalVirtual);
+	// Initialize Audio
+#ifdef ENABLE_ASM
+	InitProcSupport();
 #endif
-	// Allow allocations of at least 16MB
-	if (gMemStatus.dwTotalPhys < 16*1024*1024) gMemStatus.dwTotalPhys = 16*1024*1024;
-	TrackerSettings::Instance().m_nSampleUndoMaxBuffer = gMemStatus.dwTotalPhys / 10; // set sample und...
 
[truncated message content]

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

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

Revision: 3077
          http://sourceforge.net/p/modplug/code/3077
Author:   manxorist
Date:     2013-11-04 18:35:10 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
[Imp] Mod Export: Remember codec settings (per codec).
[Imp] Mod Export: Remember file tags.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mod2wave.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/StreamEncoder.h
    trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
    trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
    trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
    trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
    trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
    trunk/OpenMPT/mptrack/mod2wave.h
    trunk/OpenMPT/soundlib/Tagging.h

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -72,6 +72,38 @@
 	return 0;
 }
 
+
+static std::wstring GetDefaultArtist()
+//------------------------------------
+{
+	if(std::getenv("USERNAME"))
+	{
+		return mpt::String::Decode(std::getenv("USERNAME"), mpt::CharsetLocale);
+	}
+	return std::wstring();
+}
+
+
+static std::wstring GetDefaultYear()
+//----------------------------------
+{
+	return mpt::String::Decode(CTime::GetCurrentTime().Format("%Y").GetString(), mpt::CharsetLocale);
+}
+
+
+StoredTags::StoredTags(SettingsContainer &conf)
+//---------------------------------------------
+	: artist(conf, "Export", "TagArtist", GetDefaultArtist())
+	, album(conf, "Export", "TagAlbum", L"")
+	, trackno(conf, "Export", "TagTrackNo", L"")
+	, year(conf, "Export", "TagYear", GetDefaultYear())
+	, url(conf, "Export", "TagURL", L"")
+	, genre(conf, "Export", "TagGenre", L"")
+{
+	return;
+}
+
+
 ///////////////////////////////////////////////////
 // CWaveConvert - setup for converting a wave file
 
@@ -91,10 +123,10 @@
 END_MESSAGE_MAP()
 
 
-CWaveConvert::CWaveConvert(CWnd *parent, ORDERINDEX minOrder, ORDERINDEX maxOrder, ORDERINDEX numOrders, CSoundFile *sndfile, std::size_t defaultEncoder, const std::vector<EncoderFactoryBase*> &encFactories)
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CWaveConvert::CWaveConvert(CWnd *parent, ORDERINDEX minOrder, ORDERINDEX maxOrder, ORDERINDEX numOrders, CSoundFile *sndfile, const std::vector<EncoderFactoryBase*> &encFactories)
+//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 	: CDialog(IDD_WAVECONVERT, parent)
-	, m_Settings(defaultEncoder, encFactories)
+	, m_Settings(theApp.GetSettings(), encFactories)
 {
 	ASSERT(!encFactories.empty());
 	encTraits = m_Settings.GetTraits();
@@ -167,11 +199,17 @@
 	FillChannels();
 	FillFormats();
 
-	SetDlgItemText(IDC_EDIT11, m_pSndFile->GetTitle().c_str());
+	LoadTags();
+
 	m_EditYear.SetLimitText(4);
-	CTime tTime = CTime::GetCurrentTime();
-	m_EditYear.SetWindowText(tTime.Format("%Y"));
 
+	m_EditTitle.SetWindowText(mpt::String::Encode(m_Settings.Tags.title, mpt::CharsetLocale).c_str());
+	m_EditAuthor.SetWindowText(mpt::String::Encode(m_Settings.Tags.artist, mpt::CharsetLocale).c_str());
+	m_EditURL.SetWindowText(mpt::String::Encode(m_Settings.Tags.url, mpt::CharsetLocale).c_str());
+	m_EditAlbum.SetWindowText(mpt::String::Encode(m_Settings.Tags.album, mpt::CharsetLocale).c_str());
+	m_EditYear.SetWindowText(mpt::String::Encode(m_Settings.Tags.year, mpt::CharsetLocale).c_str());
+	m_EditGenre.SetWindowText(mpt::String::Encode(m_Settings.Tags.genre, mpt::CharsetLocale).c_str());
+
 	FillTags();
 
 	// Plugin quirk options are only available if there are any plugins loaded.
@@ -192,19 +230,46 @@
 }
 
 
+void CWaveConvert::LoadTags()
+//---------------------------
+{
+	m_Settings.Tags.title = mpt::String::Decode(m_pSndFile->GetTitle(), mpt::CharsetLocale);
+	m_Settings.Tags.comments = mpt::String::Decode(m_pSndFile->songMessage, mpt::CharsetLocale);
+	m_Settings.Tags.artist = m_Settings.storedTags.artist;
+	m_Settings.Tags.album = m_Settings.storedTags.album;
+	m_Settings.Tags.trackno = m_Settings.storedTags.trackno;
+	m_Settings.Tags.year = m_Settings.storedTags.year;
+	m_Settings.Tags.url = m_Settings.storedTags.url;
+	m_Settings.Tags.genre = m_Settings.storedTags.genre;
+}
+
+
+void CWaveConvert::SaveTags()
+//---------------------------
+{
+	m_Settings.storedTags.artist = m_Settings.Tags.artist;
+	m_Settings.storedTags.album = m_Settings.Tags.album;
+	m_Settings.storedTags.trackno = m_Settings.Tags.trackno;
+	m_Settings.storedTags.year = m_Settings.Tags.year;
+	m_Settings.storedTags.url = m_Settings.Tags.url;
+	m_Settings.storedTags.genre = m_Settings.Tags.genre;
+}
+
+
 void CWaveConvert::FillTags()
 //---------------------------
 {
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
 
 	const bool canTags = encTraits->canTags;
 
 	DWORD dwFormat = m_CbnSampleFormat.GetItemData(m_CbnSampleFormat.GetCurSel());
 	Encoder::Mode mode = (Encoder::Mode)((dwFormat >> 24) & 0xff);
 
-	CheckDlgButton(IDC_CHECK3, encTraits->canCues?m_Settings.EncoderSettings.Cues?TRUE:FALSE:FALSE);
+	CheckDlgButton(IDC_CHECK3, encTraits->canCues?encSettings.Cues?TRUE:FALSE:FALSE);
 	::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK3), encTraits->canCues?TRUE:FALSE);
 
-	CheckDlgButton(IDC_CHECK7, canTags?m_Settings.EncoderSettings.Tags?TRUE:FALSE:FALSE);
+	CheckDlgButton(IDC_CHECK7, canTags?encSettings.Tags?TRUE:FALSE:FALSE);
 	::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK7), canTags?TRUE:FALSE);
 	::EnableWindow(::GetDlgItem(m_hWnd, IDC_COMBO3), canTags?TRUE:FALSE);
 	::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT11), canTags?TRUE:FALSE);
@@ -272,6 +337,7 @@
 void CWaveConvert::FillSamplerates()
 //----------------------------------
 {
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
 	m_CbnSampleRate.CComboBox::ResetContent();
 	int sel = 0;
 	for(std::vector<uint32>::const_iterator it = encTraits->samplerates.begin(); it != encTraits->samplerates.end(); ++it)
@@ -279,7 +345,7 @@
 		uint32 samplerate = *it;
 		int ndx = m_CbnSampleRate.AddString(mpt::String::Format("%d Hz", samplerate).c_str());
 		m_CbnSampleRate.SetItemData(ndx, samplerate);
-		if(samplerate == m_Settings.EncoderSettings.Samplerate)
+		if(samplerate == encSettings.Samplerate)
 		{
 			sel = ndx;
 		}
@@ -291,6 +357,7 @@
 void CWaveConvert::FillChannels()
 //-------------------------------
 {
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
 	m_CbnChannels.CComboBox::ResetContent();
 	int sel = 0;
 	for(int channels = 4; channels >= 1; channels /= 2)
@@ -301,7 +368,7 @@
 		}
 		int ndx = m_CbnChannels.AddString(gszChnCfgNames[(channels+2)/2-1]);
 		m_CbnChannels.SetItemData(ndx, channels);
-		if(channels == m_Settings.EncoderSettings.Channels)
+		if(channels == encSettings.Channels)
 		{
 			sel = ndx;
 		}
@@ -313,8 +380,9 @@
 void CWaveConvert::FillFormats()
 //------------------------------
 {
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
 	m_CbnSampleFormat.CComboBox::ResetContent();
-	int sel = 0;
+	int sel = -1;
 	DWORD dwSamplerate = m_CbnSampleRate.GetItemData(m_CbnSampleRate.GetCurSel());
 	int nChannels = m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel());
 	if(encTraits->modes & Encoder::ModeQuality)
@@ -323,7 +391,7 @@
 		{
 			int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeQuality(quality * 0.01f).c_str());
 			m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeQuality<<24) | (quality<<0));
-			if(m_Settings.EncoderSettings.Mode == Encoder::ModeQuality && Util::Round<int>(m_Settings.EncoderSettings.Quality*100.0f) == quality)
+			if(encSettings.Mode == Encoder::ModeQuality && Util::Round<int>(encSettings.Quality*100.0f) == quality)
 			{
 				sel = ndx;
 			}
@@ -335,7 +403,7 @@
 		{
 			int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateVBR(encTraits->bitrates[bitrate]).c_str());
 			m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeVBR<<24) | (encTraits->bitrates[bitrate]<<0));
-			if(m_Settings.EncoderSettings.Mode == Encoder::ModeVBR && static_cast<int>(m_Settings.EncoderSettings.Bitrate) == encTraits->bitrates[bitrate])
+			if(encSettings.Mode == Encoder::ModeVBR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
 			{
 				sel = ndx;
 			}
@@ -347,7 +415,7 @@
 		{
 			int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateABR(encTraits->bitrates[bitrate]).c_str());
 			m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeABR<<24) | (encTraits->bitrates[bitrate]<<0));
-			if(m_Settings.EncoderSettings.Mode == Encoder::ModeABR && static_cast<int>(m_Settings.EncoderSettings.Bitrate) == encTraits->bitrates[bitrate])
+			if(encSettings.Mode == Encoder::ModeABR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
 			{
 				sel = ndx;
 			}
@@ -359,7 +427,7 @@
 		{
 			int ndx = m_CbnSampleFormat.AddString(m_Settings.GetEncoderFactory()->DescribeBitrateCBR(encTraits->bitrates[bitrate]).c_str());
 			m_CbnSampleFormat.SetItemData(ndx, (Encoder::ModeCBR<<24) | (encTraits->bitrates[bitrate]<<0));
-			if(m_Settings.EncoderSettings.Mode == Encoder::ModeCBR && static_cast<int>(m_Settings.EncoderSettings.Bitrate) == encTraits->bitrates[bitrate])
+			if(encSettings.Mode == Encoder::ModeCBR && static_cast<int>(encSettings.Bitrate) == encTraits->bitrates[bitrate])
 			{
 				sel = ndx;
 			}
@@ -381,15 +449,42 @@
 			}
 			int ndx = m_CbnSampleFormat.AddString(format.Description.c_str());
 			m_CbnSampleFormat.SetItemData(ndx, i & 0xffff);
-			if(m_Settings.EncoderSettings.Mode & Encoder::ModeEnumerated && (int)i == encTraits->defaultFormat)
+			if(encSettings.Mode & Encoder::ModeEnumerated && (int)i == encSettings.Format)
 			{
 				sel = ndx;
-			} else if(m_Settings.EncoderSettings.Mode & Encoder::ModeEnumerated && format.Bitrate > 0 && m_Settings.EncoderSettings.Bitrate == format.Bitrate)
+			}
+		}
+		if(sel == -1 && encSettings.Mode & Encoder::ModeEnumerated)
+		{
+			// select enumerated format based on bitrate
+			for(int ndx = 0; ndx < m_CbnSampleFormat.GetCount(); ++ndx)
 			{
-				sel = ndx;
+				int i = (int)((m_CbnSampleFormat.GetItemData(ndx) >> 0) & 0xffff);
+				const Encoder::Format &format = encTraits->formats[i];
+				if(format.Bitrate != 0 && encSettings.Bitrate == format.Bitrate)
+				{
+					sel = ndx;
+				}
 			}
 		}
+		if(sel == -1 && encSettings.Mode & Encoder::ModeEnumerated && encTraits->defaultBitrate != 0)
+		{
+			// select enumerated format based on default bitrate
+			for(int ndx = 0; ndx < m_CbnSampleFormat.GetCount(); ++ndx)
+			{
+				int i = (int)((m_CbnSampleFormat.GetItemData(ndx) >> 0) & 0xffff);
+				const Encoder::Format &format = encTraits->formats[i];
+				if(encSettings.Bitrate == encTraits->defaultBitrate)
+				{
+					sel = ndx;
+				}
+			}
+		}
 	}
+	if(sel == -1)
+	{
+		sel = 0;
+	}
 	m_CbnSampleFormat.SetCurSel(sel);
 }
 
@@ -397,6 +492,7 @@
 void CWaveConvert::OnFileTypeChanged()
 //------------------------------------
 {
+	SaveEncoderSettings();
 	DWORD dwFileType = m_CbnFileType.GetItemData(m_CbnFileType.GetCurSel());
 	m_Settings.SelectEncoder(dwFileType);
 	encTraits = m_Settings.GetTraits();
@@ -410,6 +506,7 @@
 void CWaveConvert::OnSamplerateChanged()
 //--------------------------------------
 {
+	SaveEncoderSettings();
 	//DWORD dwSamplerate = m_CbnSampleRate.GetItemData(m_CbnSampleRate.GetCurSel());
 	FillFormats();
 }
@@ -418,6 +515,7 @@
 void CWaveConvert::OnChannelsChanged()
 //------------------------------------
 {
+	SaveEncoderSettings();
 	//UINT nChannels = m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel());
 	FillFormats();
 }
@@ -426,6 +524,7 @@
 void CWaveConvert::OnFormatChanged()
 //----------------------------------
 {
+	SaveEncoderSettings();
 	//DWORD dwFormat = m_CbnSampleFormat.GetItemData(m_CbnSampleFormat.GetCurSel());
 	FillTags();
 }
@@ -528,8 +627,69 @@
 	m_bChannelMode = IsDlgButtonChecked(IDC_CHECK4) != BST_UNCHECKED;
 	m_bInstrumentMode= IsDlgButtonChecked(IDC_CHECK6) != BST_UNCHECKED;
 
-	m_Settings.EncoderSettings.Samplerate = m_CbnSampleRate.GetItemData(m_CbnSampleRate.GetCurSel());
-	m_Settings.EncoderSettings.Channels = (uint16)m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel());
+	SaveEncoderSettings();
+
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
+
+	m_Settings.Tags = FileTags();
+
+	if(encSettings.Tags)
+	{
+		CString tmp;
+
+		m_EditTitle.GetWindowText(tmp);
+		m_Settings.Tags.title = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+
+		m_EditAuthor.GetWindowText(tmp);
+		m_Settings.Tags.artist = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+
+		m_EditAlbum.GetWindowText(tmp);
+		m_Settings.Tags.album = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+
+		m_EditURL.GetWindowText(tmp);
+		m_Settings.Tags.url = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+
+		if((encTraits->modesWithFixedGenres & encSettings.Mode) && !encTraits->genres.empty())
+		{
+			m_CbnGenre.GetWindowText(tmp);
+			m_Settings.Tags.genre = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+		} else
+		{
+			m_EditGenre.GetWindowText(tmp);
+			m_Settings.Tags.genre = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+		}
+
+		m_EditYear.GetWindowText(tmp);
+		m_Settings.Tags.year = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
+		if(m_Settings.Tags.year == L"0")
+		{
+			m_Settings.Tags.year = std::wstring();
+		}
+
+		if(!m_pSndFile->songMessage.empty())
+		{
+			m_Settings.Tags.comments = mpt::String::Decode(m_pSndFile->songMessage, mpt::CharsetLocale);
+		}
+
+		m_Settings.Tags.bpm = mpt::String::Decode(mpt::String::Format("%d", (int)m_pSndFile->GetCurrentBPM()), mpt::CharsetLocale);
+
+		SaveTags();
+
+	}
+
+	CDialog::OnOK();
+
+}
+
+
+void CWaveConvert::SaveEncoderSettings()
+//--------------------------------------
+{
+
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
+
+	encSettings.Samplerate = m_CbnSampleRate.GetItemData(m_CbnSampleRate.GetCurSel());
+	encSettings.Channels = (uint16)m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel());
 	DWORD dwFormat = m_CbnSampleFormat.GetItemData(m_CbnSampleFormat.GetCurSel());
 
 	if(encTraits->modes & Encoder::ModeEnumerated)
@@ -542,75 +702,40 @@
 		{
 			m_Settings.FinalSampleFormat = encTraits->formats[format].Sampleformat;
 		}
-		m_Settings.EncoderSettings.Format = format;
-		m_Settings.EncoderSettings.Mode = encTraits->defaultMode;
-		m_Settings.EncoderSettings.Bitrate = encTraits->defaultBitrate;
-		m_Settings.EncoderSettings.Quality = encTraits->defaultQuality;
+		encSettings.Format = format;
+		encSettings.Mode = Encoder::ModeEnumerated;
+		encSettings.Bitrate = encTraits->formats[format].Bitrate != 0 ? encTraits->formats[format].Bitrate : encTraits->defaultBitrate;
+		encSettings.Quality = encTraits->defaultQuality;
 	} else
 	{
 		m_Settings.FinalSampleFormat = SampleFormatFloat32;
 		Encoder::Mode mode = (Encoder::Mode)((dwFormat >> 24) & 0xff);
 		int quality = (int)((dwFormat >> 0) & 0xff);
 		int bitrate = (int)((dwFormat >> 0) & 0xffff);
-		m_Settings.EncoderSettings.Mode = mode;
-		m_Settings.EncoderSettings.Bitrate = bitrate;
-		m_Settings.EncoderSettings.Quality = static_cast<float>(quality) * 0.01f;
-		m_Settings.EncoderSettings.Format = -1;
+		encSettings.Mode = mode;
+		encSettings.Bitrate = bitrate;
+		encSettings.Quality = static_cast<float>(quality) * 0.01f;
+		encSettings.Format = -1;
 	}
 	
-	m_Settings.EncoderSettings.Cues = IsDlgButtonChecked(IDC_CHECK3) ? true : false;
+	encSettings.Cues = IsDlgButtonChecked(IDC_CHECK3) ? true : false;
 
-	{
+	encSettings.Tags = IsDlgButtonChecked(IDC_CHECK7) ? true : false;
 
-		m_Settings.EncoderSettings.Tags = IsDlgButtonChecked(IDC_CHECK7) ? true : false;
+}
 
-		m_Settings.Tags = FileTags();
 
-		if(m_Settings.EncoderSettings.Tags)
+std::size_t CWaveConvertSettings::FindEncoder(const std::string &name) const
+//--------------------------------------------------------------------------
+{
+	for(std::size_t i = 0; i < EncoderFactories.size(); ++i)
+	{
+		if(EncoderFactories[i]->GetTraits().encoderSettingsName == name)
 		{
-			CString tmp;
-
-			m_EditTitle.GetWindowText(tmp);
-			m_Settings.Tags.title = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-
-			m_EditAuthor.GetWindowText(tmp);
-			m_Settings.Tags.artist = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-
-			m_EditAlbum.GetWindowText(tmp);
-			m_Settings.Tags.album = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-
-			m_EditURL.GetWindowText(tmp);
-			m_Settings.Tags.url = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-
-			if((encTraits->modesWithFixedGenres & m_Settings.EncoderSettings.Mode) && !encTraits->genres.empty())
-			{
-				m_CbnGenre.GetWindowText(tmp);
-				m_Settings.Tags.genre = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-			} else
-			{
-				m_EditGenre.GetWindowText(tmp);
-				m_Settings.Tags.genre = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-			}
-
-			m_EditYear.GetWindowText(tmp);
-			m_Settings.Tags.year = mpt::String::Decode(tmp.GetString(), mpt::CharsetLocale);
-			if(m_Settings.Tags.year == L"0")
-			{
-				m_Settings.Tags.year = std::wstring();
-			}
-
-			if(!m_pSndFile->songMessage.empty())
-			{
-				m_Settings.Tags.comments = mpt::String::Decode(m_pSndFile->songMessage, mpt::CharsetLocale);
-			}
-
-			m_Settings.Tags.bpm = mpt::String::Decode(mpt::String::Format("%d", (int)m_pSndFile->GetCurrentBPM()), mpt::CharsetLocale);
-
+			return i;
 		}
-
 	}
-
-	CDialog::OnOK();
+	return EncoderFactories.size() > 2 ? 2 : 0;
 }
 
 
@@ -620,15 +745,12 @@
 	ASSERT(!EncoderFactories.empty());
 	ASSERT(index < EncoderFactories.size());
 	EncoderIndex = index;
-	const Encoder::Traits *encTraits = GetTraits();
-	EncoderSettings.Mode = encTraits->defaultMode;
-	EncoderSettings.Bitrate = encTraits->defaultBitrate;
-	EncoderSettings.Quality = encTraits->defaultQuality;
+	EncoderName = EncoderFactories[EncoderIndex]->GetTraits().encoderSettingsName;
 }
 
 
 EncoderFactoryBase *CWaveConvertSettings::GetEncoderFactory() const
-//--------------------------------------------------------------
+//-----------------------------------------------------------------
 {
 	ASSERT(!EncoderFactories.empty());
 	return EncoderFactories[EncoderIndex];
@@ -643,15 +765,44 @@
 }
 
 
-CWaveConvertSettings::CWaveConvertSettings(std::size_t defaultEncoder, const std::vector<EncoderFactoryBase*> &encFactories)
-//--------------------------------------------------------------------------------------------------------------------------
+Encoder::Settings &CWaveConvertSettings::GetEncoderSettings() const
+//-----------------------------------------------------------------
+{
+	ASSERT(!EncoderSettings.empty());
+	return *(EncoderSettings[EncoderIndex]);
+}
+
+
+CWaveConvertSettings::CWaveConvertSettings(SettingsContainer &conf, const std::vector<EncoderFactoryBase*> &encFactories)
+//-----------------------------------------------------------------------------------------------------------------------
 	: EncoderFactories(encFactories)
-	, EncoderIndex(defaultEncoder)
+	, EncoderName(conf, "Export", encFactories.size() > 2 ? "LossyEncoder" : "LosslessEncoder", "")
+	, EncoderIndex(FindEncoder(EncoderName))
 	, FinalSampleFormat(SampleFormatInt16)
-	, EncoderSettings(true, true, 44100, 2, Encoder::ModeCBR, 256, 0.8f, -1)
+	, storedTags(conf)
 	, Normalize(false)
 	, SilencePlugBuffers(false)
 {
+	for(std::size_t i = 0; i < EncoderFactories.size(); ++i)
+	{
+		const Encoder::Traits &encTraits = EncoderFactories[i]->GetTraits();
+		EncoderSettings.push_back(
+			MPT_SHARED_PTR<Encoder::Settings>(
+				new Encoder::Settings(
+					conf,
+					encTraits.encoderSettingsName,
+					encTraits.canCues,
+					encTraits.canTags,
+					encTraits.defaultSamplerate,
+					encTraits.defaultChannels,
+					encTraits.defaultMode,
+					encTraits.defaultBitrate,
+					encTraits.defaultQuality,
+					encTraits.defaultFormat
+				)
+			)
+		);
+	}
 	SelectEncoder(EncoderIndex);
 }
 
@@ -711,8 +862,9 @@
 		return;
 	}
 
-	const uint32 samplerate = m_Settings.EncoderSettings.Samplerate;
-	const uint16 channels = m_Settings.EncoderSettings.Channels;
+	Encoder::Settings &encSettings = m_Settings.GetEncoderSettings();
+	const uint32 samplerate = encSettings.Samplerate;
+	const uint16 channels = encSettings.Channels;
 
 	ASSERT(m_Settings.GetEncoderFactory() && m_Settings.GetEncoderFactory()->IsAvailable());
 	IAudioStreamEncoder *fileEnc = m_Settings.GetEncoderFactory()->ConstructStreamEncoder(fileStream);
@@ -759,8 +911,8 @@
 	if ((!m_dwFileLimit) || (m_dwFileLimit > 2047*1024)) m_dwFileLimit = 2047*1024; // 2GB
 	m_dwFileLimit <<= 10;
 
-	fileEnc->SetFormat(m_Settings.EncoderSettings);
-	if(m_Settings.EncoderSettings.Tags)
+	fileEnc->SetFormat(encSettings);
+	if(encSettings.Tags)
 	{
 		// Tags must be written before audio data,
 		// so that the encoder class could write them before audio data if mandated by the format,
@@ -1013,7 +1165,7 @@
 
 	if(m_pSndFile->m_PatternCuePoints.size() > 0)
 	{
-		if(m_Settings.EncoderSettings.Cues)
+		if(encSettings.Cues)
 		{
 			std::vector<PatternCuePoint>::const_iterator iter;
 			std::vector<uint64> cues;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -1648,7 +1648,7 @@
 
 	if ((!pMainFrm) || (!m_SndFile.GetType()) || encFactories.empty()) return;
 
-	CWaveConvert wsdlg(pMainFrm, nMinOrder, nMaxOrder, m_SndFile.Order.GetLengthTailTrimmed() - 1, &m_SndFile, encFactories.size() > 2 ? 2 : 0, encFactories);
+	CWaveConvert wsdlg(pMainFrm, nMinOrder, nMaxOrder, m_SndFile.Order.GetLengthTailTrimmed() - 1, &m_SndFile, encFactories);
 	if (wsdlg.DoModal() != IDOK) return;
 
 	EncoderFactoryBase *encFactory = wsdlg.m_Settings.GetEncoderFactory();

Modified: trunk/OpenMPT/mptrack/StreamEncoder.h
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.h	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoder.h	2013-11-04 18:35:10 UTC (rev 3077)
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include "Settings.h"
+
 #include "soundlib/Tagging.h"
 #include "soundlib/SampleFormat.h"
 
@@ -75,12 +77,42 @@
 		ModeInvalid    = 0
 	};
 
+} // namespace Encoder
+
+template<> inline SettingValue ToSettingValue(const Encoder::Mode &val)
+{
+	switch(val)
+	{
+		case Encoder::ModeCBR: return SettingValue("CBR", "Encoder::Mode"); break;
+		case Encoder::ModeABR: return SettingValue("ABR", "Encoder::Mode"); break;
+		case Encoder::ModeVBR: return SettingValue("VBR", "Encoder::Mode"); break;
+		case Encoder::ModeQuality: return SettingValue("Quality", "Encoder::Mode"); break;
+		case Encoder::ModeEnumerated: return SettingValue("Enumerated", "Encoder::Mode"); break;
+		default: return SettingValue("Invalid", "Encoder::Mode"); break;
+	}
+}
+template<> inline Encoder::Mode FromSettingValue(const SettingValue &val)
+{
+	ASSERT(val.GetTypeTag() == "Encoder::Mode");
+	if(val.as<std::string>() == "") { return Encoder::ModeInvalid; }
+	else if(val.as<std::string>() == "CBR") { return Encoder::ModeCBR; }
+	else if(val.as<std::string>() == "ABR") { return Encoder::ModeABR; }
+	else if(val.as<std::string>() == "VBR") { return Encoder::ModeVBR; }
+	else if(val.as<std::string>() == "Quality") { return Encoder::ModeQuality; }
+	else if(val.as<std::string>() == "Enumerated") { return Encoder::ModeEnumerated; }
+	else { return Encoder::ModeInvalid; }
+}
+
+namespace Encoder
+{
+
 	struct Traits
 	{
 		
 		std::string fileExtension;
 		std::string fileDescription;
 		std::string fileShortDescription;
+		std::string encoderSettingsName;
 		std::string encoderName;
 		std::string description;
 
@@ -126,26 +158,26 @@
 	struct Settings
 	{
 		
-		bool Cues;
-		bool Tags;
+		Setting<bool> Cues;
+		Setting<bool> Tags;
 
-		uint32 Samplerate;
-		uint16 Channels;
+		Setting<uint32> Samplerate;
+		Setting<uint16> Channels;
 
-		Encoder::Mode Mode;
-		int Bitrate;
-		float Quality;
-		int Format;
+		Setting<Encoder::Mode> Mode;
+		Setting<int> Bitrate;
+		Setting<float> Quality;
+		Setting<int> Format;
 		
-		Settings(bool cues, bool tags, uint32 samplerate, uint16 channels, Encoder::Mode mode, int bitrate, float quality, int format)
-			: Cues(cues)
-			, Tags(tags)
-			, Samplerate(samplerate)
-			, Channels(channels)
-			, Mode(mode)
-			, Bitrate(bitrate)
-			, Quality(quality)
-			, Format(format)
+		Settings(SettingsContainer &conf, const std::string &encoderName, bool cues, bool tags, uint32 samplerate, uint16 channels, Encoder::Mode mode, int bitrate, float quality, int format)
+			: Cues(conf, "Export", encoderName + "_" + "Cues", cues)
+			, Tags(conf, "Export", encoderName + "_" + "Tags", tags)
+			, Samplerate(conf, "Export", encoderName + "_" + "Samplerate", samplerate)
+			, Channels(conf, "Export", encoderName + "_" + "Channels", channels)
+			, Mode(conf, "Export", encoderName + "_" + "Mode", mode)
+			, Bitrate(conf, "Export", encoderName + "_" + "Bitrate", bitrate)
+			, Quality(conf, "Export", encoderName + "_" + "Quality", quality)
+			, Format(conf, "Export", encoderName + "_" + "Format", format)
 		{
 			return;
 		}

Modified: trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -260,6 +260,7 @@
 	traits.fileExtension = "flac";
 	traits.fileShortDescription = "FLAC";
 	traits.fileDescription = "FLAC";
+	traits.encoderSettingsName = "FLAC";
 	traits.encoderName = "libFLAC";
 	std::ostringstream description;
 	description << "Free Lossless Audio Codec" << std::endl;
@@ -288,7 +289,7 @@
 			}
 		}
 	}
-	traits.defaultSamplerate = 44100;
+	traits.defaultSamplerate = 96000;
 	traits.defaultChannels = 2;
 	traits.defaultMode = Encoder::ModeEnumerated;
 	traits.defaultFormat = 0;

Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -422,6 +422,7 @@
 		traits.fileExtension = "mp3";
 		traits.fileShortDescription = "MP3 (Lame)";
 		traits.fileDescription = "MPEG-1/2 Layer 3";
+		traits.encoderSettingsName = "MP3Lame";
 		traits.encoderName = "libMP3Lame";
 		traits.description += "Version: ";
 		traits.description += (get_lame_version()?get_lame_version():"");
@@ -707,6 +708,7 @@
 		traits.fileExtension = "mp3";
 		traits.fileShortDescription = std::string("MP3 ") + (lame ? "(Lame_enc)" : "(BladeEnc)");
 		traits.fileDescription = "MPEG-1 Layer 3";
+		traits.encoderSettingsName = "MP3Blade";
 		traits.encoderName = lame ? "Lame_enc.dll" : "BladeEnc.dll";
 		std::ostringstream description;
 		BE_VERSION ver;
@@ -1080,6 +1082,7 @@
 		{
 			name << "Microsoft Windows ACM " << ((ver>>24)&0xff) << "." << ((ver>>16)&0xff);
 		}
+		traits.encoderSettingsName = "MP3ACM";
 		traits.encoderName = name.str();
 		for(std::set<std::string>::const_iterator i = drivers.begin(); i != drivers.end(); ++i)
 		{

Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -160,6 +160,7 @@
 		traits.fileExtension = "opus";
 		traits.fileShortDescription = "Opus";
 		traits.fileDescription = "Opus";
+		traits.encoderSettingsName = "Opus";
 		traits.encoderName = "libOpus";
 		traits.description += "Version: ";
 		traits.description += (opus_get_version_string&&opus_get_version_string()?opus_get_version_string():"");

Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -188,6 +188,7 @@
 		traits.fileExtension = "ogg";
 		traits.fileShortDescription = "Vorbis";
 		traits.fileDescription = "Ogg Vorbis";
+		traits.encoderSettingsName = "Vorbis";
 		traits.encoderName = "libVorbis";
 		traits.description += "Version: ";
 		traits.description += (vorbis_version_string&&vorbis_version_string()?vorbis_version_string():"unknown");

Modified: trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp	2013-11-04 18:35:10 UTC (rev 3077)
@@ -165,6 +165,7 @@
 	traits.fileExtension = "wav";
 	traits.fileShortDescription = "Wave";
 	traits.fileDescription = "Wave";
+	traits.encoderSettingsName = "Wave";
 	traits.encoderName = "OpenMPT";
 	traits.description = "Microsoft RIFF WAVE";
 	traits.canTags = true;
@@ -196,7 +197,7 @@
 			}
 		}
 	}
-	traits.defaultSamplerate = 44100;
+	traits.defaultSamplerate = 96000;
 	traits.defaultChannels = 2;
 	traits.defaultMode = Encoder::ModeEnumerated;
 	traits.defaultFormat = 0;

Modified: trunk/OpenMPT/mptrack/mod2wave.h
===================================================================
--- trunk/OpenMPT/mptrack/mod2wave.h	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/mptrack/mod2wave.h	2013-11-04 18:35:10 UTC (rev 3077)
@@ -11,27 +11,49 @@
 #pragma once
 
 #include "StreamEncoder.h"
+#include "Settings.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Direct To Disk Recording
 
 
+struct StoredTags
+{
+	Setting<std::wstring> artist;
+	Setting<std::wstring> album;
+	Setting<std::wstring> trackno;
+	Setting<std::wstring> year;
+	Setting<std::wstring> url;
+
+	Setting<std::wstring> genre;
+
+	StoredTags(SettingsContainer &conf);
+
+};
+
+
 struct CWaveConvertSettings
 {
 	std::vector<EncoderFactoryBase*> EncoderFactories;
+	std::vector<MPT_SHARED_PTR<Encoder::Settings> > EncoderSettings;
+
+	Setting<std::string> EncoderName;
 	std::size_t EncoderIndex;
 
 	SampleFormat FinalSampleFormat;
-	Encoder::Settings EncoderSettings;
+
+	StoredTags storedTags;
 	FileTags Tags;
 
 	bool Normalize;
 	bool SilencePlugBuffers;
 
+	std::size_t FindEncoder(const std::string &name) const;
 	void SelectEncoder(std::size_t index);
 	EncoderFactoryBase *GetEncoderFactory() const;
 	const Encoder::Traits *GetTraits() const;
-	CWaveConvertSettings(std::size_t defaultEncoder, const std::vector<EncoderFactoryBase*> &encFactories);
+	Encoder::Settings &GetEncoderSettings() const;
+	CWaveConvertSettings(SettingsContainer &conf, const std::vector<EncoderFactoryBase*> &encFactories);
 };
 
 //================================
@@ -66,8 +88,13 @@
 	void FillFormats();
 	void FillTags();
 
+	void LoadTags();
+
+	void SaveEncoderSettings();
+	void SaveTags();
+
 public:
-	CWaveConvert(CWnd *parent, ORDERINDEX minOrder, ORDERINDEX maxOrder, ORDERINDEX numOrders, CSoundFile *sndfile, std::size_t defaultEncoder, const std::vector<EncoderFactoryBase*> &encFactories);
+	CWaveConvert(CWnd *parent, ORDERINDEX minOrder, ORDERINDEX maxOrder, ORDERINDEX numOrders, CSoundFile *sndfile, const std::vector<EncoderFactoryBase*> &encFactories);
 
 public:
 	void UpdateDialog();

Modified: trunk/OpenMPT/soundlib/Tagging.h
===================================================================
--- trunk/OpenMPT/soundlib/Tagging.h	2013-11-04 18:25:57 UTC (rev 3076)
+++ trunk/OpenMPT/soundlib/Tagging.h	2013-11-04 18:35:10 UTC (rev 3077)
@@ -19,9 +19,21 @@
 //=============
 {
 
-	// Tag data
-	std::wstring title, artist, album, year, comments, genre, url, encoder, bpm, trackno;
+	std::wstring encoder;
 
+	std::wstring title;
+	std::wstring comments;
+
+	std::wstring bpm;
+
+	std::wstring artist;
+	std::wstring album;
+	std::wstring trackno;
+	std::wstring year;
+	std::wstring url;
+
+	std::wstring genre;
+
 	FileTags();
 
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

[<sag...@us...>]

Revision: 3080
          http://sourceforge.net/p/modplug/code/3080
Author:   saga-games
Date:     2013-11-04 19:29:54 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
[Int] Add experimental plugin bridge code. Not integrated into the main project yet, just here for version control. This code is still rather unstable.

Added Paths:
-----------
    trunk/OpenMPT/pluginBridge/
    trunk/OpenMPT/pluginBridge/AEffectWrapper.h
    trunk/OpenMPT/pluginBridge/Bridge.cpp
    trunk/OpenMPT/pluginBridge/Bridge.h
    trunk/OpenMPT/pluginBridge/BridgeCommon.h
    trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp
    trunk/OpenMPT/pluginBridge/BridgeWrapper.h
    trunk/OpenMPT/pluginBridge/PluginBridge.filters
    trunk/OpenMPT/pluginBridge/PluginBridge.rc
    trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj
    trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj.filters

Index: trunk/OpenMPT/pluginBridge
===================================================================
--- trunk/OpenMPT/pluginBridge	2013-11-04 18:40:53 UTC (rev 3079)
+++ trunk/OpenMPT/pluginBridge	2013-11-04 19:29:54 UTC (rev 3080)

Property changes on: trunk/OpenMPT/pluginBridge
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,4 ##
+*.aps
+*.user
+Debug
+Release
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Added: trunk/OpenMPT/pluginBridge/AEffectWrapper.h
===================================================================
--- trunk/OpenMPT/pluginBridge/AEffectWrapper.h	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/AEffectWrapper.h	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,149 @@
+#pragma once
+
+#include <vector>
+#define VST_FORCE_DEPRECATED 0
+#include "../include/vstsdk2.4/pluginterfaces/vst2.x/aeffectx.h"
+
+#pragma pack(push, 8)
+
+template<typename ptr_t>
+struct AEffectProto
+{
+	int32_t magic;
+	ptr_t dispatcher;
+	ptr_t process;
+	ptr_t setParameter;
+	ptr_t getParameter;
+
+	int32_t numPrograms;
+	int32_t numParams;
+	int32_t numInputs;
+	int32_t numOutputs;
+
+	int32_t flags;
+	
+	ptr_t resvd1;
+	ptr_t resvd2;
+	
+	int32_t initialDelay;
+	
+	int32_t realQualities;
+	int32_t offQualities;
+	float ioRatio;
+
+	ptr_t object;
+	ptr_t user;
+
+	int32_t uniqueID;
+	int32_t version;
+
+	ptr_t processReplacing;
+	ptr_t processDoubleReplacing;
+	char future[56];
+
+	// Convert native representation to bridge representation.
+	// Don't overwrite any values managed by the bridge wrapper or host in general.
+	void FromNative(const AEffect &in)
+	{
+		magic = in.magic;
+		//dispatcher = 0;
+		//process = in.process ? 1 : 0;
+		//setParameter = 0;
+		//getParameter = 0;
+
+		numPrograms = in.numPrograms;
+		numParams = in.numParams;
+		numInputs = in.numInputs;
+		numOutputs = in.numOutputs;
+
+		flags = in.flags;
+
+		//resvd1 = 0;
+		//resvd2 = 0;
+
+		initialDelay = in.initialDelay;
+
+		realQualities = in.realQualities;
+		offQualities = in.offQualities;
+		ioRatio = in.ioRatio;
+
+		//object = 0;
+		//user = 0;
+
+		uniqueID = in.uniqueID;
+		version = in.version;
+
+		//processReplacing = in.processReplacing ? 2 : 0;
+		//processDoubleReplacing = in.processDoubleReplacing ? 3 : 0;
+
+		//memset(future, 0, sizeof(future));
+
+		if(in.processReplacing == nullptr)
+		{
+			flags &= ~effFlagsCanReplacing;
+		}
+		if(in.processDoubleReplacing == nullptr)
+		{
+			flags &= ~effFlagsCanDoubleReplacing;
+		}
+	}
+};
+
+typedef AEffectProto<int32_t> AEffect32;
+typedef AEffectProto<int64_t> AEffect64;
+
+
+#pragma pack(pop)
+
+
+// Translate a VSTEvents struct to bridge format (placed in data vector)
+static void TranslateVSTEventsToBridge(std::vector<char> &data, const VstEvents *events, int32_t targetPtrSize)
+{
+	data.reserve(data.size() + sizeof(int32_t) + sizeof(VstEvent) * events->numEvents);
+	// Write number of events
+	PushToVector(data, events->numEvents);
+
+	// Write events
+	for(VstInt32 i = 0; i < events->numEvents; i++)
+	{
+		if(events->events[i]->type == kVstSysExType)
+		{
+			// This is going to be messy since the VstMidiSysexEvent event has a different size than other events on 64-bit platforms.
+			// We are going to write the event using the target process pointer size.
+			const VstMidiSysexEvent *event = reinterpret_cast<const VstMidiSysexEvent *>(events->events[i]);
+			PushToVector(data, *events->events[i], sizeof(VstEvent) + sizeof(VstInt32));	// Regular VstEvent struct + dump size
+			data.resize(data.size() + 3 * targetPtrSize);									// Dump pointer + two reserved VstIntPtrs
+			// Embed SysEx dump as well...
+			data.insert(data.end(), event->sysexDump, event->sysexDump + event->dumpBytes);
+		} else
+		{
+			PushToVector(data, *events->events[i], events->events[i]->byteSize);
+		}
+	}
+}
+
+
+// Translate bridge format (void *ptr) back to VSTEvents struct (placed in data vector)
+static void TranslateBridgeToVSTEvents(std::vector<char> &data, void *ptr)
+{
+	int32_t numEvents = *static_cast<const int32_t *>(ptr);
+
+	data.resize(sizeof(VstInt32) + sizeof(VstIntPtr) + sizeof(VstEvent *) * numEvents, 0);
+	VstEvents *events = reinterpret_cast<VstEvents *>(&data[0]);
+	events->numEvents = numEvents;
+
+	// Write pointers
+	char *offset = static_cast<char *>(ptr) + sizeof(int32_t);
+	for(int32_t i = 0; i < numEvents; i++)
+	{
+		events->events[i] = reinterpret_cast<VstEvent *>(offset);
+		offset += events->events[i]->byteSize;
+		if(events->events[i]->type == kVstSysExType)
+		{
+			VstMidiSysexEvent *event = reinterpret_cast<VstMidiSysexEvent *>(events->events[i]);
+			event->byteSize = sizeof(VstMidiSysexEvent);	// Adjust to target platform
+			event->sysexDump = offset;
+			offset += event->dumpBytes;
+		}
+	}
+}
\ No newline at end of file

Added: trunk/OpenMPT/pluginBridge/Bridge.cpp
===================================================================
--- trunk/OpenMPT/pluginBridge/Bridge.cpp	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/Bridge.cpp	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,826 @@
+// TODO
+// Host <-> bridge communication of memory size
+// Have independent process signal
+// Thread safety: Keep multiple messages, when multiple threads are waiting for a signal, we need to figure out which one got its result!
+// Translate VstIntPtr size in remaining structs!!! VstFileSelect, VstVariableIo, VstOfflineTask, VstAudioFile, VstWindow, VstFileSelect
+// Properly handle sharedMem.otherProcess and ask threads to die properly in every situation
+// => sigThreadExit might already be an invalid handle the time it arrives in the thread
+// Resizing the mix buffer transfer area
+// Bridge should tell host about memory layout, host shouldn't assume things
+// Freeze during load: otium, electri-q
+// => If a message occours while waiting for an ACK, send a custom SetEvent() handle with the message which should be triggered
+
+// Low priority:
+// Speed up things like consecutive calls to CVstPlugin::GetFormattedProgramName by a custom opcode
+// Re-enable DEP in OpenMPT?
+// Module files supposedly opened in plugin wrapper => Does DuplicateHandle word on the host side? Otherwise, named events
+
+#define _CRT_SECURE_NO_WARNINGS
+#define NOMINMAX
+#define VST_FORCE_DEPRECATED 0
+#define MODPLUG_TRACKER
+#define CountOf(x) _countof(x)
+#include <Windows.h>
+#include <tchar.h>
+#include <cstdint>
+#include <algorithm>
+
+#include "Bridge.h"
+
+#include <iostream>	// TODO DEBUG ONLY
+
+
+// This is kind of a back-up pointer in case we couldn't sneak our pointer into the AEffect struct yet.
+// It always points to the last intialized PluginBridge object. Right now there's just one, but we might
+// have to initialize more than one plugin in a container at some point to get plugins like SideKickv3 to work.
+PluginBridge *PluginBridge::latestInstance = nullptr;
+
+
+int _tmain(int argc, TCHAR *argv[])
+{
+	if(argc < 8)
+	{
+		MessageBox(NULL, _T("This executable is part of OpenMPT. You do not need to run it by yourself."), _T("Plugin Bridge"), 0);
+		return -1;
+	}
+
+	PluginBridge pb(argv);
+	return 0;
+}
+
+
+PluginBridge::PluginBridge(TCHAR *argv[]) : window(NULL)
+{
+	PluginBridge::latestInstance = this;
+
+	if(!CreateMapping(argv[0]))
+	{
+		exit(-1);
+	}
+
+	// Store parent process handle so that we can terminate the bridge process when OpenMPT closes.
+	sharedMem.otherProcess = OpenProcess(SYNCHRONIZE, FALSE, _ttoi(argv[1]));
+
+	sharedMem.sigToHost.Create(argv[2], argv[3]);
+	sharedMem.sigToBridge.Create(argv[4], argv[5]);
+	sharedMem.sigProcess.Create(argv[6], argv[7]);
+
+	sharedMem.sigThreadExit = CreateEvent(NULL, FALSE, FALSE, NULL);
+	DWORD dummy;	// For Win9x
+	CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&RenderThread, (LPVOID)this, 0, &dummy);
+
+	// Tell the parent process that we've initialized the shared memory and are ready to go.
+	sharedMem.sigToHost.Confirm();
+
+	const HANDLE objects[] = { sharedMem.sigToBridge.send, sharedMem.otherProcess };
+	DWORD result;
+	do
+	{
+		result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, /*100*/INFINITE);
+		if(result == WAIT_OBJECT_0)
+		{
+			ParseNextMessage();
+		}
+		if(window)
+		{
+			//PeekMessage?
+			MSG msg;
+			GetMessage(&msg, window, 0, 0);
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+	} while(result != WAIT_OBJECT_0 + 1);
+	CloseHandle(sharedMem.otherProcess);
+}
+
+
+// Create our shared memory object. Returns true on success.
+bool PluginBridge::CreateMapping(const TCHAR *memName)
+{
+	SECURITY_ATTRIBUTES secAttr;
+	secAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+	secAttr.lpSecurityDescriptor = nullptr;
+	secAttr.bInheritHandle = TRUE;
+
+	// Create the file mapping object.
+	CloseMapping();
+	sharedMem.mapFile = CreateFileMapping(INVALID_HANDLE_VALUE, &secAttr, PAGE_READWRITE,
+		0, sharedMem.queueSize + sharedMem.sampleBufSize, memName);
+	if(sharedMem.mapFile == NULL)
+	{
+		return false;
+	}
+
+	sharedMem.sharedPtr = static_cast<char *>(MapViewOfFile(sharedMem.mapFile, FILE_MAP_ALL_ACCESS,
+		0, 0, sharedMem.queueSize + sharedMem.sampleBufSize));
+	if(sharedMem.sharedPtr == nullptr)
+	{
+		CloseMapping();
+		return false;
+	}
+
+	// Map a view of the file mapping into the address space of the current process.
+	sharedMem.effectPtr = reinterpret_cast<AEffect *>(sharedMem.sharedPtr);
+	sharedMem.sampleBufPtr = sharedMem.sharedPtr + sizeof(AEffect64);
+	sharedMem.queuePtr = sharedMem.sharedPtr + sharedMem.sampleBufSize;
+	sharedMem.sampleBufSize -= sizeof(AEffect64);
+
+	return true;
+}
+
+
+// Destroy our shared memory object.
+void PluginBridge::CloseMapping()
+{
+	if(sharedMem.mapFile)
+	{
+		if(sharedMem.queuePtr)
+		{
+			UnmapViewOfFile(sharedMem.queuePtr);
+			sharedMem.queuePtr = nullptr;
+		}
+		CloseHandle(sharedMem.mapFile);
+		sharedMem.mapFile = NULL;
+	}
+}
+
+
+// Send an arbitrary message to the host.
+// Returns a pointer to the message, as processed by the host.
+const MsgHeader *PluginBridge::SendToHost(const MsgHeader &msg, MsgHeader *sourceHeader)
+{
+	if(msg.size > sharedMem.queueSize)
+	{
+		// Need to increase shared memory size
+		static uint32_t pluginCounter = 0;
+		/*wchar_t name[64];
+		wsprintf(name, L"Local\\openmpt-%d-%d", GetCurrentProcessId(), pluginCounter++);*/
+		int32_t newSize = msg.size + 1024;
+
+		// TODO
+		SendToHost(ReallocMsg(0, newSize));
+		sharedMem.queueSize = newSize;
+		CreateMapping(nullptr /*name*/);
+	}
+
+	sharedMem.writeMutex.lock();
+
+	if(sharedMem.writeOffset + msg.size > sizeof(MsgQueue) + 512 * 1024 /*sharedMem.queueSize*/)
+	{
+		std::cout << "message wraparound" << std::endl;
+		sharedMem.writeOffset = sizeof(MsgQueue);
+	}
+	MsgHeader *addr = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + sharedMem.writeOffset);
+	memcpy(addr, &msg, msg.size);
+
+	if(sourceHeader != nullptr)
+	{
+		// Interrupting a command..
+		sourceHeader->interruptOffset = sharedMem.writeOffset;
+		SetEvent(reinterpret_cast<HANDLE>(sourceHeader->interruptSignal));
+	} else
+	{
+		// Simply sending a new command
+		MsgQueue *queue = static_cast<MsgQueue *>(sharedMem.queuePtr);
+		queue->toHost.offset[queue->toHost.writeIndex++] = sharedMem.writeOffset;
+		if(queue->toHost.writeIndex >= CountOf(queue->toHost.offset))
+		{
+			queue->toHost.writeIndex = 0;
+		}
+		sharedMem.sigToHost.Send();
+	}
+
+	//sharedMem.writeMutex.unlock();
+
+	// Wait until we get the result from the host.
+	const HANDLE objects[] = { sharedMem.sigToHost.ack, sharedMem.otherProcess, sharedMem.sigToBridge.send };
+	DWORD result;
+	do
+	{
+		result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, INFINITE);
+		if(result == WAIT_OBJECT_0 + 2)
+		{
+			ParseNextMessage();
+		}
+	} while(result != WAIT_OBJECT_0 && result != WAIT_OBJECT_0 + 1 && result != WAIT_FAILED);
+
+	sharedMem.writeMutex.unlock();
+	return (result == WAIT_OBJECT_0) ? addr : nullptr;
+}
+
+
+// Copy AEffect to shared memory.
+void PluginBridge::UpdateEffectStruct()
+{
+	if(sharedMem.otherPtrSize == 4)
+	{
+		reinterpret_cast<AEffect32 *>(sharedMem.effectPtr)->FromNative(*nativeEffect);
+	} else if(sharedMem.otherPtrSize == 8)
+	{
+		reinterpret_cast<AEffect64 *>(sharedMem.effectPtr)->FromNative(*nativeEffect);
+	}
+}
+
+
+// Receive a message from the host and translate it.
+void PluginBridge::ParseNextMessage(MsgHeader *parentMessage)
+{
+	MsgHeader *msg;
+	if(parentMessage == nullptr)
+	{
+		// Default: Grab next message
+		MsgQueue *queue = static_cast<MsgQueue *>(sharedMem.queuePtr);
+		uint32_t index = InterlockedExchangeAdd(&(queue->toBridge.readIndex), 1) % CountOf(queue->toBridge.offset);
+		msg = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + queue->toBridge.offset[index]);
+	} else
+	{
+		// Read interrupt message
+		msg = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + parentMessage->interruptOffset);
+	}
+
+	switch(msg->type)
+	{
+	case MsgHeader::init:
+		InitBridge(static_cast<InitMsg *>(msg));
+		break;
+	case MsgHeader::close:
+		CloseBridge();
+		break;
+	case MsgHeader::dispatch:
+		DispatchToPlugin(static_cast<DispatchMsg *>(msg));
+		break;
+	case MsgHeader::setParameter:
+		SetParameter(static_cast<ParameterMsg *>(msg));
+		break;
+	case MsgHeader::getParameter:
+		GetParameter(static_cast<ParameterMsg *>(msg));
+		break;
+	}
+	sharedMem.sigToBridge.Confirm();
+}
+
+
+// Load the plugin.
+void PluginBridge::InitBridge(InitMsg *msg)
+{
+	msg->result = 0;
+	msg->mapSize = sharedMem.queueSize;
+	//msg->hostPtrSize = sizeof(VstIntPtr);
+	// TODO
+	msg->samplesOffset = sharedMem.queueSize - sharedMem.sampleBufSize;
+	
+	if(msg->headerSize != sizeof(MsgHeader))
+	{
+		wcscpy(msg->str, L"Host message format is not compatible with bridge");
+		return;
+	}
+	if(msg->version != InitMsg::protocolVersion)
+	{
+		swprintf(msg->str, CountOf(msg->str), L"Host protocol version (%u) differs from expected version (%u)", msg->version, InitMsg::protocolVersion);
+		return;
+	}
+
+	std::wcout << msg->str << std::endl;
+	nativeEffect = nullptr;
+	library = LoadLibraryW(msg->str);
+
+	if(library == nullptr)
+	{
+		FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+			GetLastError(),
+			MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+			msg->str,
+			CountOf(msg->str),
+			NULL);
+		return;
+	}
+
+	typedef AEffect * (VSTCALLBACK * PVSTPLUGENTRY)(audioMasterCallback);
+	PVSTPLUGENTRY pMainProc = (PVSTPLUGENTRY)GetProcAddress(library, "VSTPluginMain");
+	if(pMainProc == nullptr)
+	{
+		pMainProc = (PVSTPLUGENTRY)GetProcAddress(library, "main");
+	}
+
+	if(pMainProc != nullptr)
+	{
+		try
+		{
+			nativeEffect = pMainProc(MasterCallback);
+		} catch(...)
+		{
+			nativeEffect = nullptr;
+		}
+	}
+
+	if(nativeEffect == nullptr || nativeEffect->dispatcher == nullptr || nativeEffect->magic != kEffectMagic)
+	{
+		FreeLibrary(library);
+		library = nullptr;
+		
+		wcscpy(msg->str, L"File is not a valid plugin");
+		return;
+	}
+
+	nativeEffect->resvd1 = ToVstPtr(this);
+
+	sharedMem.otherPtrSize = msg->hostPtrSize;
+	msg->result = 1;
+
+	UpdateEffectStruct();
+	// Let's identify ourselves...
+	memcpy(&(sharedMem.effectPtr->resvd1), "OMPT", 4);
+}
+
+
+// Unload the plugin.
+void PluginBridge::CloseBridge()
+{
+	CloseMapping();
+	SetEvent(sharedMem.sigThreadExit);
+	exit(0);
+}
+
+
+// Re-initialize the shared memory object with a different amount of memory.
+void PluginBridge::ReallocateBridge(ReallocMsg *msg)
+{
+	// TODO
+	//sharedMem.size = msg->mapSize;
+	//CreateMapping(msg->str);
+}
+
+
+// Host-to-plugin opcode dispatcher
+void PluginBridge::DispatchToPlugin(DispatchMsg *msg)
+{
+	// Various dispatch data - depending on the opcode, one of those might be used.
+	std::vector<char> extraData;
+	size_t extraDataSize = 0;
+
+	// Content of ptr is usually stored right after the message header, ptr field indicates size.
+	void *ptr = (msg->ptr != 0) ? (msg + 1) : nullptr;
+
+	switch(msg->opcode)
+	{
+	case effGetProgramName:
+	case effGetParamLabel:
+	case effGetParamDisplay:
+	case effGetParamName:
+	case effString2Parameter:
+	case effGetProgramNameIndexed:
+	case effGetEffectName:
+	case effGetErrorText:
+	case effGetVendorString:
+	case effGetProductString:
+	case effShellGetNextPlugin:
+		// Name in [ptr]
+		extraDataSize = 256;
+		break;
+
+	case effEditGetRect:
+		// ERect** in [ptr]
+		extraDataSize = sizeof(void *);
+		break;
+
+	case effEditOpen:
+		// HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/windows/desktop/aa384203%28v=vs.85%29.aspx)
+		std::cout << "open!" << std::endl;
+		Sleep(1000);
+		ptr = reinterpret_cast<void *>(msg->ptr);
+		if(0)
+		{
+			WNDCLASSEX wcex;
+
+			wcex.cbSize = sizeof(WNDCLASSEX);
+			wcex.style = CS_HREDRAW | CS_VREDRAW;
+			wcex.lpfnWndProc = DefWindowProc;
+			wcex.cbClsExtra = 0;
+			wcex.cbWndExtra = 0;
+			wcex.hInstance = GetModuleHandle(NULL);
+			wcex.hIcon = NULL;
+			wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
+			wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW + 1);
+			wcex.lpszMenuName = NULL;
+			wcex.lpszClassName = _T("OpenMPTPluginBridge");
+			wcex.hIconSm = NULL;
+
+			if(!RegisterClassEx(&wcex))
+			{
+				msg->result = 0;
+				return;
+			}
+
+			ptr = window = CreateWindow(
+				_T("OpenMPTPluginBridge"),
+				_T("OpenMPT Plugin Bridge"),
+				WS_VISIBLE | WS_POPUP,
+				CW_USEDEFAULT, CW_USEDEFAULT,
+				windowSize.right - windowSize.left, windowSize.bottom- windowSize.top,
+				/*reinterpret_cast<HWND>(msg->ptr)*/ NULL,
+				NULL,
+				wcex.hInstance,
+				NULL);
+			//SetParent(window, reinterpret_cast<HWND>(msg->ptr));
+		}
+		break;
+
+	case effEditClose:
+		DestroyWindow(window);
+		window = NULL;
+		break;
+
+	case effGetChunk:
+		// void** in [ptr] for chunk data address
+		extraDataSize = sizeof(void *);
+		break;
+
+	case effProcessEvents:
+		// VstEvents* in [ptr]
+		TranslateBridgeToVSTEvents(extraData, ptr);
+		ptr = &extraData[0];
+		break;
+
+	case effOfflineNotify:
+		// VstAudioFile* in [ptr]
+		extraData.resize(sizeof(VstAudioFile *) * static_cast<size_t>(msg->value));
+		ptr = &extraData[0];
+		for(int64_t i = 0; i < msg->value; i++)
+		{
+			// TODO create pointers
+		}
+		break;
+
+	case effOfflinePrepare:
+	case effOfflineRun:
+		// VstOfflineTask* in [ptr]
+		extraData.resize(sizeof(VstOfflineTask *) * static_cast<size_t>(msg->value));
+		ptr = &extraData[0];
+		for(int64_t i = 0; i < msg->value; i++)
+		{
+			// TODO create pointers
+		}
+		break;
+
+	case effSetSpeakerArrangement:
+	case effGetSpeakerArrangement:
+		// VstSpeakerArrangement* in [value] and [ptr]
+		msg->value = reinterpret_cast<int64_t>(ptr) + sizeof(VstSpeakerArrangement);
+		break;
+
+	case effVendorSpecific:
+		// Let's implement some custom opcodes!
+		if(msg->index == CCONST('O', 'M', 'P', 'T'))
+		{
+			msg->result = 1;
+			switch(msg->value)
+			{
+			case 0:
+				UpdateEffectStruct();
+				break;
+			default:
+				msg->result = 0;
+			}
+			return;
+		}
+		break;
+	}
+
+	if(extraDataSize != 0)
+	{
+		extraData.resize(extraDataSize, 0);
+		ptr = &extraData[0];
+	}
+
+	//std::cout << "about to dispatch " << msg->opcode << " to effect...";
+	//std::flush(std::cout);
+	try
+	{
+		msg->result = nativeEffect->dispatcher(nativeEffect, msg->opcode, msg->index, static_cast<VstIntPtr>(msg->value), ptr, msg->opt);
+	} catch(...)
+	{
+		SendToHost(ErrorMsg(L"Exception in dispatch()!"));
+	}
+	//std::cout << "done" << std::endl;
+
+	// Post-fix some opcodes
+	switch(msg->opcode)
+	{
+	case effClose:
+		nativeEffect = nullptr;
+		FreeLibrary(library);
+		library = nullptr;
+		return;
+
+	case effGetProgramName:
+	case effGetParamLabel:
+	case effGetParamDisplay:
+	case effGetParamName:
+	case effString2Parameter:
+	case effGetProgramNameIndexed:
+	case effGetEffectName:
+	case effGetErrorText:
+	case effGetVendorString:
+	case effGetProductString:
+	case effShellGetNextPlugin:
+		// Name in [ptr]
+		extraData.back() = 0;
+		vst_strncpy(reinterpret_cast<char *>(msg + 1), &extraData[0], static_cast<size_t>(msg->ptr - 1));
+		break;
+
+	case effEditGetRect:
+		// ERect** in [ptr]
+		{
+			ERect *rectPtr = *reinterpret_cast<ERect **>(&extraData[0]);
+			if(rectPtr != nullptr)
+			{
+				memcpy(msg + 1, rectPtr, std::min<size_t>(sizeof(ERect), static_cast<size_t>(msg->ptr)));
+				windowSize = *rectPtr;
+			}
+		}
+		break;
+
+	case effGetChunk:
+		// void** in [ptr] for chunk data address
+		{
+			void *chunkPtr = *reinterpret_cast<void **>(&extraData[0]);
+			if(chunkPtr != nullptr)
+			{
+				memcpy(msg + 1, *reinterpret_cast<void **>(&extraData[0]), std::min(static_cast<size_t>(msg->result), static_cast<size_t>(msg->ptr)));
+			}
+		}
+		break;
+	}
+
+	UpdateEffectStruct();	// Regularly update the struct
+}
+
+
+// Set a plugin parameter.
+void PluginBridge::SetParameter(ParameterMsg *msg)
+{
+	try
+	{
+		nativeEffect->setParameter(nativeEffect, msg->index, msg->value);
+	} catch(...)
+	{
+		SendToHost(ErrorMsg(L"Exception in setParameter()!"));
+	}
+}
+
+
+// Get a plugin parameter.
+void PluginBridge::GetParameter(ParameterMsg *msg)
+{
+	try
+	{
+		msg->value = nativeEffect->getParameter(nativeEffect, msg->index);
+	} catch(...)
+	{
+		SendToHost(ErrorMsg(L"Exception in getParameter()!"));
+	}
+}
+
+
+// Audio rendering thread
+DWORD WINAPI PluginBridge::RenderThread(LPVOID param)
+{
+	PluginBridge *that = static_cast<PluginBridge *>(param);
+
+	const HANDLE objects[] = { that->sharedMem.sigProcess.send, that->sharedMem.sigThreadExit };
+	DWORD result = 0;
+	do
+	{
+		result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, INFINITE);
+		if(result == WAIT_OBJECT_0)
+		{
+			ProcessMsg *msg = static_cast<ProcessMsg *>(that->sharedMem.sampleBufPtr);
+			switch(msg->processType)
+			{
+			case ProcessMsg::process:
+				that->Process();
+				break;
+			case ProcessMsg::processReplacing:
+				that->ProcessReplacing();
+				break;
+			case ProcessMsg::processDoubleReplacing:
+				that->ProcessDoubleReplacing();
+				break;
+			}
+			that->sharedMem.sigProcess.Confirm();
+		}
+	} while(result != WAIT_OBJECT_0 + 1 && result != WAIT_OBJECT_0 + 2 && result != WAIT_FAILED);
+	CloseHandle(that->sharedMem.sigThreadExit);
+	return 0;
+}
+
+
+// Process audio.
+void PluginBridge::Process()
+{
+	if(nativeEffect->process)
+	{
+		float **inPointers, **outPointers;
+		int32_t sampleFrames = BuildProcessPointers(inPointers, outPointers);
+		try
+		{
+			nativeEffect->process(nativeEffect, inPointers, outPointers, sampleFrames);
+		} catch(...)
+		{
+			SendToHost(ErrorMsg(L"Exception in process()!"));
+		}
+	}
+}
+
+
+// Process audio.
+void PluginBridge::ProcessReplacing()
+{
+	if(nativeEffect->processReplacing)
+	{
+		float **inPointers, **outPointers;
+		int32_t sampleFrames = BuildProcessPointers(inPointers, outPointers);
+		try
+		{
+			nativeEffect->processReplacing(nativeEffect, inPointers, outPointers, sampleFrames);
+		} catch(...)
+		{
+			SendToHost(ErrorMsg(L"Exception in processReplacing()!"));
+		}
+	}
+}
+
+
+// Process audio.
+void PluginBridge::ProcessDoubleReplacing()
+{
+	if(nativeEffect->processDoubleReplacing)
+	{
+		double **inPointers, **outPointers;
+		int32_t sampleFrames = BuildProcessPointers(inPointers, outPointers);
+		try
+		{
+			nativeEffect->processDoubleReplacing(nativeEffect, inPointers, outPointers, sampleFrames);
+		} catch(...)
+		{
+			SendToHost(ErrorMsg(L"Exception in processDoubleReplacing()!"));
+		}
+	}
+}
+
+
+// Helper function to build the pointer arrays required by the VST process functions.
+template<typename buf_t>
+int32_t PluginBridge::BuildProcessPointers(buf_t **(&inPointers), buf_t **(&outPointers))
+{
+	ProcessMsg *msg = static_cast<ProcessMsg *>(sharedMem.sampleBufPtr);
+	size_t numPtrs = msg->numInputs + msg->numOutputs;
+	samplePointers.resize(numPtrs, 0);
+	buf_t *offset = reinterpret_cast<buf_t *>(msg + 1);
+	for(size_t i = 0; i < numPtrs; i++)
+	{
+		samplePointers[i] = offset;
+		offset += msg->sampleFrames;
+	}
+	inPointers = reinterpret_cast<buf_t **>(&samplePointers[0]);
+	outPointers = reinterpret_cast<buf_t **>(&samplePointers[msg->numInputs]);
+	return msg->sampleFrames;
+}
+
+
+// Send a message to the host.
+VstIntPtr PluginBridge::DispatchToHost(VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt)
+{
+	std::vector<char> dispatchData(sizeof(DispatchMsg), 0);
+	int64_t ptrOut = 0;
+	char *ptrC = static_cast<char *>(ptr);
+
+	switch(opcode)
+	{
+	case audioMasterGetTime:
+		// VstTimeInfo* in [return value]
+		ptrOut = sizeof(VstTimeInfo);
+		break;
+
+	case audioMasterProcessEvents:
+		// VstEvents* in [ptr]
+		TranslateVSTEventsToBridge(dispatchData, static_cast<VstEvents *>(ptr), sharedMem.otherPtrSize);
+		ptrOut = dispatchData.size() - sizeof(DispatchMsg);
+		break;
+
+	case audioMasterIOChanged:
+		// We need to be sure that the new values are known to the master.
+		UpdateEffectStruct();
+		break;
+
+	case audioMasterSizeWindow:
+		if(window)
+		{
+			SetWindowPos(window, NULL, 0, 0, index, value, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+		}
+		break;
+
+	case audioMasterGetPreviousPlug:
+	case audioMasterGetNextPlug:
+		// Don't even bother, this would explode :)
+		return 0;
+
+	case audioMasterGetOutputSpeakerArrangement:
+	case audioMasterGetInputSpeakerArrangement:
+		// VstSpeakerArrangement* in [return value]
+		ptrOut = sizeof(VstSpeakerArrangement);
+		break;
+
+	case audioMasterGetVendorString:
+	case audioMasterGetProductString:
+		// Name in [ptr]
+		ptrOut = 256;
+		break;
+
+	case audioMasterCanDo:
+		// Name in [ptr]
+		{
+			ptrOut = strlen(ptrC) + 1;
+			dispatchData.insert(dispatchData.end(), ptrC, ptrC + ptrOut);
+		}
+
+	case audioMasterGetDirectory:
+		// Name in [return value]
+		ptrOut = 256;
+		break;
+
+	case audioMasterOpenFileSelector:
+	case audioMasterCloseFileSelector:
+		// VstFileSelect* in [ptr]
+		// TODO
+		ptrOut = sizeof(VstFileSelect);
+		break;
+
+	default:
+		if(ptr != nullptr) DebugBreak();
+	}
+
+	if(ptrOut != 0)
+	{
+		// In case we only reserve space and don't copy stuff over...
+		dispatchData.resize(sizeof(DispatchMsg) + static_cast<size_t>(ptrOut), 0);
+	}
+	
+	//std::cout << "about to dispatch " << opcode << " to host...";
+	//std::flush(std::cout);
+	const DispatchMsg *resultMsg;
+	{
+		DispatchMsg *msg = reinterpret_cast<DispatchMsg *>(&dispatchData[0]);
+		new (msg) DispatchMsg(opcode, index, value, ptrOut, opt, static_cast<int32_t>(dispatchData.size() - sizeof(DispatchMsg)));
+		resultMsg = static_cast<const DispatchMsg *>(SendToHost(*msg));
+	}
+	//std::cout << "done." << std::endl;
+
+	if(resultMsg == nullptr)
+	{
+		return 0;
+	}
+
+	const char *extraData = reinterpret_cast<const char*>(resultMsg + 1);
+	// Post-fix some opcodes
+	switch(opcode)
+	{
+	case audioMasterGetTime:
+		// VstTimeInfo* in [return value]
+		memcpy(&host2PlugMem.timeInfo, extraData, sizeof(VstTimeInfo));
+		return ToVstPtr<VstTimeInfo>(&host2PlugMem.timeInfo);
+
+	case audioMasterGetOutputSpeakerArrangement:
+	case audioMasterGetInputSpeakerArrangement:
+		// VstSpeakerArrangement* in [return value]
+		memcpy(&host2PlugMem.speakerArrangement, extraData, sizeof(VstSpeakerArrangement));
+		return ToVstPtr<VstSpeakerArrangement>(&host2PlugMem.speakerArrangement);
+
+	case audioMasterGetVendorString:
+	case audioMasterGetProductString:
+		// Name in [ptr]
+		strcpy(ptrC, extraData);
+		break;
+	
+	case audioMasterGetDirectory:
+		// Name in [return value]
+		vst_strncpy(host2PlugMem.name, extraData, CountOf(host2PlugMem.name) - 1);
+		return ToVstPtr<char>(host2PlugMem.name);
+
+	case audioMasterOpenFileSelector:
+	case audioMasterCloseFileSelector:
+		// VstFileSelect* in [ptr]
+		// TODO
+		break;
+	}
+
+	return static_cast<VstIntPtr>(resultMsg->result);
+}
+
+
+// Helper function for sending messages to the host.
+VstIntPtr VSTCALLBACK PluginBridge::MasterCallback(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt)
+{
+	PluginBridge *instance = (effect != nullptr && effect->resvd1 != 0) ? FromVstPtr<PluginBridge>(effect->resvd1) : PluginBridge::latestInstance;
+	return instance->DispatchToHost(opcode, index, value, ptr, opt);
+}

Added: trunk/OpenMPT/pluginBridge/Bridge.h
===================================================================
--- trunk/OpenMPT/pluginBridge/Bridge.h	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/Bridge.h	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <vector>
+#include "BridgeCommon.h"
+
+class PluginBridge
+{
+protected:
+	static PluginBridge *latestInstance;
+
+	// Plugin
+	AEffect *nativeEffect;
+	HINSTANCE library;
+	ERect windowSize;
+	HWND window;
+
+	// Static memory for host-to-plugin pointers
+	union
+	{
+		VstSpeakerArrangement speakerArrangement;
+		VstTimeInfo timeInfo;
+		char name[256];
+	} host2PlugMem;
+
+	// Shared memory
+	SharedMem sharedMem;
+
+	// Pointers to sample data
+	std::vector<void *> samplePointers;
+
+public:
+	PluginBridge(TCHAR *argv[]);
+
+protected:
+	bool CreateMapping(const TCHAR *memName);
+	void CloseMapping();
+	const MsgHeader *SendToHost(const MsgHeader &msg, MsgHeader *sourceHeader = nullptr);
+
+	void UpdateEffectStruct();
+
+	void ParseNextMessage(MsgHeader *parentMessage = nullptr);
+	void InitBridge(InitMsg *msg);
+	void CloseBridge();
+	void ReallocateBridge(ReallocMsg *msg);
+	void DispatchToPlugin(DispatchMsg *msg);
+	void SetParameter(ParameterMsg *msg);
+	void GetParameter(ParameterMsg *msg);
+	void Process();
+	void ProcessReplacing();
+	void ProcessDoubleReplacing();
+	VstIntPtr DispatchToHost(VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt);
+
+	template<typename buf_t>
+	int32_t BuildProcessPointers(buf_t **(&inPointers), buf_t **(&outPointers));
+
+	static DWORD WINAPI RenderThread(LPVOID param);
+
+	static VstIntPtr VSTCALLBACK MasterCallback(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt);
+};
\ No newline at end of file

Added: trunk/OpenMPT/pluginBridge/BridgeCommon.h
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeCommon.h	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/BridgeCommon.h	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,258 @@
+#pragma once
+
+// Insert some object at the end of a char vector.
+template<typename T>
+static void PushToVector(std::vector<char> &data, const T &obj, size_t writeSize = sizeof(T))
+{
+#ifdef HAS_TYPE_TRAITS
+	static_assert(std::is_pointer<T>::value == false, "Won't push pointers to data vectors.");
+#endif // HAS_TYPE_TRAITS
+	const char *objC = reinterpret_cast<const char *>(&obj);
+	data.insert(data.end(), objC, objC + writeSize);
+}
+
+#include "AEffectWrapper.h"
+#include "../common/mutex.h"
+
+// Bridge communication data
+
+#pragma pack(push, 8)
+
+// Host-to-bridge message to initiate a process call.
+struct ProcessMsg
+{
+	enum ProcessType
+	{
+		process = 0,
+		processReplacing,
+		processDoubleReplacing,
+	};
+
+	int32_t processType;
+	int32_t numInputs;
+	int32_t numOutputs;
+	int32_t sampleFrames;
+	// Input and output buffers follow
+
+	ProcessMsg(ProcessMsg::ProcessType processType, int32_t numInputs, int32_t numOutputs, int32_t sampleFrames) :
+		processType(processType), numInputs(numInputs), numOutputs(numOutputs), sampleFrames(sampleFrames) { }
+};
+
+
+template<size_t queueSize>
+struct MsgQueueProto
+{
+	uint32_t readIndex;
+	uint32_t writeIndex;
+	uint32_t offset[queueSize];
+
+	MsgQueueProto() : readIndex(0), writeIndex(0) { }
+};
+
+
+struct MsgQueue
+{
+	MsgQueueProto<1024> toHost;
+	MsgQueueProto<1024> toBridge;
+};
+
+
+// General message header
+struct MsgHeader
+{
+	enum BridgeMessageType
+	{
+		// Management messages, host to bridge
+		init = 0,
+		close,
+		// Management messages, bridge to host
+		reallocate,
+		errorMsg,
+
+		// VST messages, common
+		dispatch,
+		// VST messages, host to bridge
+		setParameter,
+		getParameter,
+	};
+
+	uint32_t headerSize;		// sizeof(MsgHeader), only here because the struct would be padded anyway, and as extra verification during the intialization step.
+	uint32_t size;				// Size of complete message, including this header
+	uint32_t type;				// See BridgeMessageType
+	uint32_t ackSignal;			// Signal to send when processing of this message is done
+	uint32_t interruptSignal;	// Signal to send when this thread needs to send back a new message while handling this message
+	uint32_t interruptOffset;	// Offset of message in buffer if interruptSignal has been fired (set by interrupting thread).
+	int64_t  result;			// Result of this message (exact meaning depends on message type, not every message has a result)
+
+	MsgHeader(uint32_t type, uint32_t size) : headerSize(sizeof(MsgHeader)), size(size), type(type), ackSignal(0), interruptSignal(0), interruptOffset(0), result(0) { }
+};
+
+
+// Host-to-bridge initialization message
+struct InitMsg : public MsgHeader
+{
+	enum ProtocolVersion
+	{
+		protocolVersion = 1,
+	};
+
+	int32_t version;		// In: Protocol version used by host
+	int32_t mapSize;		// Out: Current map size
+	int32_t samplesOffset;	// Out: Offset into shared memory of sample buffers
+	int32_t hostPtrSize;	// In: Size of VstIntPtr in host
+	wchar_t str[_MAX_PATH];	// In: Plugin file to load. Out: Error message if result != 0.
+
+	InitMsg(const wchar_t *pluginPath) : MsgHeader(MsgHeader::init, sizeof(InitMsg)),
+		version(protocolVersion), hostPtrSize(sizeof(VstIntPtr))
+	{
+		wcsncpy(str, pluginPath, CountOf(str) - 1);
+		str[CountOf(str) - 1] = 0;
+	}
+};
+
+
+// Bridge-to-host memory reallocation message
+struct ReallocMsg : public MsgHeader
+{
+	enum DefaultSizes
+	{
+		defaultMapSize = 1024 * 1024,
+		defaultGlobalsSize = sizeof(AEffect64) + sizeof(ProcessMsg) + 512 * 16 * 4,	// 16 channels of floats
+	};
+
+	//wchar_t str[64];	// New map name
+	int32_t  handle;	// New map handle
+	uint32_t mapSize;	// New map size
+
+	ReallocMsg(int32_t newHandle, uint32_t size) : MsgHeader(MsgHeader::reallocate, sizeof(ReallocMsg)), handle(newHandle), mapSize(size) { }
+	/*ReallocMsg(wchar_t *newName, uint32_t size) : MsgHeader(MsgHeader::reallocate, sizeof(ReallocMsg)), mapSize(size)
+	{
+		wcsncpy(str, newName, CountOf(str) - 1);
+		str[CountOf(str) - 1] = 0;
+	}*/
+};
+
+
+// Host-to-bridge VST dispatch message
+struct DispatchMsg : public MsgHeader
+{
+	int32_t opcode;
+	int32_t index;
+	int64_t value;
+	int64_t ptr;	// Usually, this will be the size of ptr. In that case, the data itself is stored after this struct.
+	float   opt;
+
+	DispatchMsg(int32_t opcode, int32_t index, int64_t value, int64_t ptr, float opt, int32_t extraSize) : MsgHeader(MsgHeader::dispatch, sizeof(DispatchMsg) + extraSize),
+		opcode(opcode), index(index), value(value), ptr(ptr), opt(opt) { }
+};
+
+
+// Host-to-bridge VST setParameter / getParameter message
+struct ParameterMsg : public MsgHeader
+{
+	int32_t index;
+	float value;
+
+	ParameterMsg(int32_t index, float value) : MsgHeader(MsgHeader::setParameter, sizeof(ParameterMsg)), index(index), value(value) { }
+	ParameterMsg(int32_t index) : MsgHeader(MsgHeader::getParameter, sizeof(ParameterMsg)), index(index), value(0) { }
+};
+
+
+// Bridge-to-host error message
+struct ErrorMsg : public MsgHeader
+{
+	wchar_t str[64];
+
+	ErrorMsg(const wchar_t *text) : MsgHeader(MsgHeader::errorMsg, sizeof(ErrorMsg))
+	{
+		wcsncpy(str, text, CountOf(str) - 1);
+		str[CountOf(str) - 1] = 0;
+	}
+};
+
+#pragma pack(pop)
+
+// Internal data
+
+struct Signal
+{
+	HANDLE send, ack;
+
+	Signal() : send(nullptr), ack(nullptr) { }
+	~Signal()
+	{
+		CloseHandle(send);
+		CloseHandle(ack);
+	}
+
+	// Create new signal
+	bool Create()
+	{
+		// We want to share our handles.
+		SECURITY_ATTRIBUTES secAttr;
+		secAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+		secAttr.lpSecurityDescriptor = nullptr;
+		secAttr.bInheritHandle = TRUE;
+
+		send = CreateEvent(&secAttr, FALSE, FALSE, NULL);
+		ack = CreateEvent(&secAttr, FALSE, FALSE, NULL);
+		return send != nullptr && ack != nullptr;
+	}
+
+	// Create signal from existing handles
+	void Create(HANDLE s, HANDLE a)
+	{
+		send = s;
+		ack = a;
+	}
+
+	// Create signal from existing handles
+	void Create(const TCHAR *s, const TCHAR *a)
+	{
+		send = reinterpret_cast<HANDLE>(_ttoi(s));
+		ack = reinterpret_cast<HANDLE>(_ttoi(a));
+	}
+
+	void Send()
+	{
+		SetEvent(send);
+	}
+
+	void Confirm()
+	{
+		SetEvent(ack);
+	}
+};
+
+
+#include <map>
+
+struct SharedMem
+{
+	Signal defaultSignal;
+	Signal interruptSignal[8];
+	std::map<uint32_t, Signal *> threadMap;	// Map thread IDs to signal pairs
+
+	// Signals for host <-> bridge communication
+	Signal sigToHost, sigToBridge, sigProcess;
+
+	HANDLE otherProcess;	// Handle of "other" process (host handle in the bridge and vice versa)
+
+	HANDLE sigThreadExit;	// Signal to kill helper thread
+
+	HANDLE mapFile;			// Internal handle of memory-mapped file
+	Util::mutex writeMutex;
+	char *sharedPtr;		// Pointer to beginning of shared memory
+	void *queuePtr;			// Pointer to shared memory queue
+	AEffect *effectPtr;		// Pointer to shared AEffect struct (with host pointer format)
+	void *sampleBufPtr;		// Pointer to shared memory area which contains sample buffers
+
+	uint32_t queueSize;		// Size of shared memory queue
+	uint32_t sampleBufSize;	// Size of shared sample memory
+	uint32_t writeOffset;	// Message offset in shared memory
+
+	int32_t otherPtrSize;
+
+	SharedMem() : mapFile(nullptr), queuePtr(nullptr), effectPtr(nullptr), sampleBufPtr(nullptr), queueSize(ReallocMsg::defaultMapSize),
+		sampleBufSize(ReallocMsg::defaultGlobalsSize), writeOffset(uint32_t(sizeof(MsgQueue))), otherPtrSize(0) { }
+};

Added: trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,597 @@
+#include "stdafx.h"
+#include "BridgeWrapper.h"
+#include "misc_util.h"
+#include "../mptrack/Mptrack.h"
+#include "../mptrack/Vstplug.h"
+#include <fstream>
+
+
+// Check whether we need to load a 32-bit or 64-bit wrapper.
+BridgeWrapper::BinaryType BridgeWrapper::GetPluginBinaryType(const char *pluginPath)
+{
+	BinaryType type = binUnknown;
+	std::ifstream file(pluginPath, std::ios::in | std::ios::binary);
+	if(file.is_open())
+	{
+		IMAGE_DOS_HEADER dosHeader;
+		IMAGE_NT_HEADERS ntHeader;
+		file.read(reinterpret_cast<char *>(&dosHeader), sizeof(dosHeader));
+		if(dosHeader.e_magic == IMAGE_DOS_SIGNATURE)
+		{
+			file.seekg(dosHeader.e_lfanew);
+			file.read(reinterpret_cast<char *>(&ntHeader), sizeof(ntHeader));
+
+			ASSERT((ntHeader.FileHeader.Characteristics & IMAGE_FILE_DLL) != 0);
+			if(ntHeader.FileHeader.Machine == IMAGE_FILE_MACHINE_I386)
+				type = bin32Bit;
+			else if(ntHeader.FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
+				type = bin64Bit;
+		}
+	}
+	return type;
+}
+
+
+BridgeWrapper::BridgeWrapper(const char *pluginPath)
+{
+	BinaryType binType;
+	if((binType = GetPluginBinaryType(pluginPath)) == binUnknown)
+	{
+		return;
+	}
+
+	static int32 plugId = 0;
+	const DWORD procId = GetCurrentProcessId();
+	std::string exeName = std::string(theApp.GetAppDirPath()) + (binType == bin64Bit ? "PluginBridge64.exe" : "PluginBridge32.exe");
+	std::string mapName = "Local\\openmpt-" + Stringify(procId) + "-" + Stringify(plugId++);
+
+	sharedMem.writeOffset = sizeof(MsgQueue) + 512 * 1024;
+	sharedMem.otherPtrSize = binType / 8;
+
+	sharedMem.sigToHost.Create();
+	sharedMem.sigToBridge.Create();
+	sharedMem.sigProcess.Create();
+	sharedMem.sigThreadExit = CreateEvent(NULL, FALSE, FALSE, NULL);
+
+	// Parameters: Name for shared memory object, parent process ID, signals
+	char cmdLine[64];
+	sprintf(cmdLine, "%s %d %d %d %d %d %d %d", mapName.c_str(), procId, sharedMem.sigToHost.send, sharedMem.sigToHost.ack, sharedMem.sigToBridge.send, sharedMem.sigToBridge.ack, sharedMem.sigProcess.send, sharedMem.sigProcess.ack);
+
+	STARTUPINFO info;
+	MemsetZero(info);
+	info.cb = sizeof(info);
+	PROCESS_INFORMATION processInfo;
+	MemsetZero(processInfo);
+
+	bool success = false;
+	if(CreateProcess(exeName.c_str(), cmdLine, NULL, NULL, TRUE, /*CREATE_NO_WINDOW */0, NULL, NULL, &info, &processInfo))
+	{
+		sharedMem.otherProcess = processInfo.hProcess;
+		const HANDLE objects[] = { sharedMem.sigToHost.ack, sharedMem.otherProcess };
+		DWORD result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, 10000);
+		if(result == WAIT_OBJECT_0)
+		{
+			success = true;
+		} else if(result == WAIT_OBJECT_0 + 1)
+		{
+			// Process died
+		}
+		CloseHandle(processInfo.hThread);
+	}
+	if(success)
+	{
+		sharedMem.mapFile = OpenFileMapping(FILE_MAP_ALL_ACCESS, TRUE, mapName.c_str());
+		if(sharedMem.mapFile)
+		{
+			// TODO De-Dupe this code
+			sharedMem.sharedPtr = static_cast<char *>(MapViewOfFile(sharedMem.mapFile, FILE_MAP_ALL_ACCESS, 0, 0, sharedMem.queueSize + sharedMem.sampleBufSize));
+			sharedMem.effectPtr = reinterpret_cast<AEffect *>(sharedMem.sharedPtr);
+			sharedMem.sampleBufPtr = sharedMem.sharedPtr + sizeof(AEffect64);
+			sharedMem.queuePtr = sharedMem.sharedPtr + sharedMem.sampleBufSize;
+			sharedMem.sampleBufSize -= sizeof(AEffect64);
+
+			// Some opcodes might be dispatched before we get the chance to fill the struct out.
+			sharedMem.effectPtr->object = this;
+
+			// Initialize bridge
+			struct InitEffect : public InitMsg
+			{
+				AEffect effectCopy;
+
+				InitEffect(const wchar_t *pluginPath) : InitMsg(pluginPath) { }
+			};
+
+			const InitEffect *initEffect = static_cast<const InitEffect *>(SendToBridge(InitEffect(mpt::String::Decode(pluginPath, mpt::CharsetLocale).c_str())));
+
+			if(initEffect == nullptr)
+			{
+				Reporting::Error("Could not initialize plugin bridge, it probably crashed.");
+			} else if(initEffect->result != 1)
+			{
+				Reporting::Error(mpt::String::Encode(initEffect->str, mpt::CharsetLocale).c_str());
+			} else
+			{
+				ASSERT(initEffect->type == MsgHeader::init);
+				sharedMem.queueSize = initEffect->mapSize;
+
+				sharedMem.effectPtr->object = this;
+				sharedMem.effectPtr->dispatcher = DispatchToPlugin;
+				sharedMem.effectPtr->setParameter = SetParameter;
+				sharedMem.effectPtr->getParameter = GetParameter;
+				sharedMem.effectPtr->process = Process;
+				if(sharedMem.effectPtr->flags & effFlagsCanReplacing) sharedMem.effectPtr->processReplacing = ProcessReplacing;
+				if(sharedMem.effectPtr->flags & effFlagsCanDoubleReplacing) sharedMem.effectPtr->processDoubleReplacing = ProcessDoubleReplacing;
+
+				DWORD dummy;	// For Win9x
+				CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&MessageThread, (LPVOID)this, 0, &dummy);
+			}
+
+		}
+	}
+}
+
+BridgeWrapper::~BridgeWrapper()
+{
+	if(sharedMem.queuePtr != nullptr)
+	{
+		SendToBridge(MsgHeader(MsgHeader::close, sizeof(MsgHeader)));
+	}
+
+	CloseHandle(sharedMem.otherProcess);
+	SetEvent(sharedMem.sigThreadExit);
+}
+
+
+DWORD WINAPI BridgeWrapper::MessageThread(LPVOID param)
+{
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(param);
+
+	const HANDLE objects[] = { that->sharedMem.sigToHost.send, that->sharedMem.otherProcess, that->sharedMem.sigThreadExit };
+	DWORD result = 0;
+	do
+	{
+		result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, INFINITE);
+		if(result == WAIT_OBJECT_0)
+		{
+			that->ParseNextMessage();
+		}
+	} while(result != WAIT_OBJECT_0 + 1 && result != WAIT_OBJECT_0 + 2 && result != WAIT_FAILED);
+	ASSERT(result != WAIT_FAILED);
+	CloseHandle(that->sharedMem.sigThreadExit);
+	return 0;
+}
+
+
+// Receive a message from the host and translate it.
+void BridgeWrapper::ParseNextMessage(MsgHeader *parentMessage)
+{
+	MsgHeader *msg;
+	if(parentMessage == nullptr)
+	{
+		// Default: Grab next message
+		MsgQueue *queue = static_cast<MsgQueue *>(sharedMem.queuePtr);
+		uint32_t index = InterlockedExchangeAdd(&(queue->toHost.readIndex), 1) % CountOf(queue->toHost.offset);
+		msg = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + queue->toHost.offset[index]);
+	} else
+	{
+		// Read interrupt message
+		msg = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + parentMessage->interruptOffset);
+	}
+
+	switch(msg->type)
+	{
+	case MsgHeader::dispatch:
+		DispatchToHost(static_cast<DispatchMsg *>(msg));
+		break;
+
+	case MsgHeader::errorMsg:
+		MessageBoxW(theApp.GetMainWnd()->m_hWnd, static_cast<ErrorMsg *>(msg)->str, L"OpenMPT Plugin Bridge", MB_ICONERROR);
+		break;
+	}
+
+	if(parentMessage == nullptr)
+		sharedMem.sigToHost.Confirm();
+	else
+		SetEvent(reinterpret_cast<HANDLE>(parentMessage->interruptSignal));	// TODO
+}
+
+
+void BridgeWrapper::DispatchToHost(DispatchMsg *msg)
+{
+	// Various dispatch data - depending on the opcode, one of those might be used.
+	std::vector<char> extraData;
+	size_t extraDataSize = 0;
+
+	void *ptr = msg + 1;		// Content of ptr is usually stored right after the message header.
+
+	switch(msg->opcode)
+	{
+	case audioMasterProcessEvents:
+		// VstEvents* in [ptr]
+		TranslateBridgeToVSTEvents(extraData, ptr);
+		ptr = &extraData[0];
+		break;
+
+		//case audioMasterOpenFileSelector:
+		//case audioMasterCloseFileSelector:
+		// TODO: Translate the structs
+	}
+
+	if(extraDataSize != 0)
+	{
+		extraData.resize(extraDataSize, 0);
+		ptr = &extraData[0];
+	}
+
+	msg->result = CVstPluginManager::MasterCallBack(sharedMem.effectPtr, msg->opcode, msg->index, static_cast<VstIntPtr>(msg->value), ptr, msg->opt);
+
+	// Post-fix some opcodes
+	switch(msg->opcode)
+	{
+	case audioMasterGetTime:
+		// VstTimeInfo* in [return value]
+		if(msg->result != 0)
+		{
+			memcpy(ptr, reinterpret_cast<void *>(msg->result), std::min(sizeof(VstTimeInfo), static_cast<size_t>(msg->ptr)));
+		}
+		break;
+
+	case audioMasterGetDirectory:
+		// char* in [return value]
+		if(msg->result != 0)
+		{
+			char *target = static_cast<char *>(ptr);
+			strncpy(target, reinterpret_cast<const char *>(msg->result), static_cast<size_t>(msg->ptr - 1));
+			target[msg->ptr - 1] = 0;
+		}
+		break;
+	}
+}
+
+
+// Send an arbitrary message to the bridge.
+// Returns a pointer to the message, as processed by the bridge.
+const MsgHeader *BridgeWrapper::SendToBridge(const MsgHeader &msg)
+{
+	if(msg.size <= sharedMem.queueSize)
+	{
+		sharedMem.writeMutex.lock();
+		if(sharedMem.writeOffset + msg.size > sharedMem.queueSize)
+		{
+			sharedMem.writeOffset = sizeof(MsgQueue) + 512 * 1024;
+		}
+		MsgHeader *addr = reinterpret_cast<MsgHeader *>(static_cast<char *>(sharedMem.queuePtr) + sharedMem.writeOffset);
+		memcpy(addr, &msg, msg.size);
+
+		MsgQueue *queue = static_cast<MsgQueue *>(sharedMem.queuePtr);
+		queue->toBridge.offset[queue->toBridge.writeIndex++] = sharedMem.writeOffset;
+		if(queue->toBridge.writeIndex >= CountOf(queue->toBridge.offset))
+		{
+			queue->toBridge.writeIndex = 0;
+		}
+
+		//sharedMem.writeMutex.unlock();
+
+		sharedMem.sigToBridge.Send();
+
+		if(msg.type == MsgHeader::dispatch && static_cast<const DispatchMsg &>(msg).opcode == effEditOpen)
+		{sharedMem.writeMutex.unlock();
+		return addr;}
+
+		// Wait until we get the result from the bridge.
+		const HANDLE objects[] = { sharedMem.sigToBridge.ack, sharedMem.otherProcess, sharedMem.sigToHost.send };
+		DWORD result;
+		do
+		{
+			result = WaitForMultipleObjects(CountOf(objects), objects, FALSE, INFINITE);
+			if(result == WAIT_OBJECT_0 + 2)
+			{
+				ParseNextMessage();
+			}
+		} while(result != WAIT_OBJECT_0 && result != WAIT_OBJECT_0 + 1);
+		if(result == WAIT_OBJECT_0 + 1)
+		{
+			SetEvent(sharedMem.sigThreadExit);
+		}
+		sharedMem.writeMutex.unlock();
+		return (result == WAIT_OBJECT_0) ? addr : nullptr;
+	}
+	return nullptr;
+}
+
+VstIntPtr VSTCALLBACK BridgeWrapper::DispatchToPlugin(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt)
+{
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+
+	std::vector<char> dispatchData(sizeof(DispatchMsg), 0);
+	int64_t ptrOut = 0;
+	bool copyPtrBack = false, ptrIsSize = true;
+	char *ptrC = static_cast<char *>(ptr);
+
+	switch(opcode)
+	{
+	case effGetProgramName:
+	case effGetParamLabel:
+	case effGetParamDisplay:
+	case effGetParamName:
+	case effString2Parameter:
+	case effGetProgramNameIndexed:
+	case effGetEffectName:
+	case effGetErrorText:
+	case effGetVendorString:
+	case effGetProductString:
+	case effShellGetNextPlugin:
+		// Name in [ptr]
+		ptrOut = 256;
+		copyPtrBack = true;
+		break;
+
+	case effSetProgramName:
+	case effCanDo:
+		// char* in [ptr]
+		ptrOut = strlen(ptrC) + 1;
+		dispatchData.insert(dispatchData.end(), ptrC, ptrC + ptrOut);
+		break;
+
+	case effEditGetRect:
+		// ERect** in [ptr]
+		ptrOut = sizeof(ERect);
+		copyPtrBack = true;
+		break;
+
+	case effEditOpen:
+		// HWND in [ptr] - Note: Window handles are interoperable between 32-bit and 64-bit applications in Windows (http://msdn.microsoft.com/en-us/library/windows/desktop/aa384203%28v=vs.85%29.aspx)
+		ptrOut = reinterpret_cast<int64_t>(ptr);
+		ptrIsSize = false;
+		break;
+
+	case effGetChunk:
+		// void** in [ptr] for chunk data address
+		break;
+
+	case effSetChunk:
+		// void* in [ptr] for chunk data
+		ptrOut = value;
+		dispatchData.insert(dispatchData.end(), ptrC, ptrC + value);
+		break;
+
+	case effProcessEvents:
+		// VstEvents* in [ptr]
+		TranslateVSTEventsToBridge(dispatchData, static_cast<VstEvents *>(ptr), that->sharedMem.otherPtrSize);
+		ptrOut = dispatchData.size() - sizeof(DispatchMsg);
+		break;
+
+	case effGetInputProperties:
+	case effGetOutputProperties:
+		// VstPinProperties* in [ptr]
+		ptrOut = sizeof(VstPinProperties);
+		copyPtrBack = true;
+		break;
+
+	case effOfflineNotify:
+		// VstAudioFile* in [ptr]
+		ptrOut = sizeof(VstAudioFile) * value;
+		// TODO
+		break;
+
+	case effOfflinePrepare:
+	case effOfflineRun:
+		// VstOfflineTask* in [ptr]
+		ptrOut = sizeof(VstOfflineTask) * value;
+		// TODO
+		break;
+
+	case effProcessVarIo:
+		// VstVariableIo* in [ptr]
+		ptrOut = sizeof(VstVariableIo);
+		// TODO
+		break;
+
+	case effSetSpeakerArrangement:
+		// VstSpeakerArrangement* in [value] and [ptr]
+		ptrOut = sizeof(VstSpeakerArrangement) * 2;
+		PushToVector(dispatchData, *static_cast<VstSpeakerArrangement *>(ptr));
+		PushToVector(dispatchData, *FromVstPtr<VstSpeakerArrangement>(value));
+		break;
+
+	case effGetParameterProperties:
+		// VstParameterProperties* in [ptr]
+		ptrOut = sizeof(VstParameterProperties);
+		copyPtrBack = true;
+		break;
+
+	case effGetMidiProgramName:
+	case effGetCurrentMidiProgram:
+		// MidiProgramName* in [ptr]
+		ptrOut = sizeof(MidiProgramName);
+		copyPtrBack = true;
+		break;
+
+	case effGetMidiProgramCategory:
+		// MidiProgramCategory* in [ptr]
+		ptrOut = sizeof(MidiProgramCategory);
+		copyPtrBack = true;
+		break;
+
+	case effGetMidiKeyName:
+		// MidiKeyName* in [ptr]
+		ptrOut = sizeof(MidiKeyName);
+		copyPtrBack = true;
+		break;
+
+	case effGetSpeakerArrangement:
+		// VstSpeakerArrangement* in [value] and [ptr]
+		ptrOut = sizeof(VstSpeakerArrangement) * 2;
+		copyPtrBack = true;
+		break;
+
+	case effBeginLoadBank:
+	case effBeginLoadProgram:
+		// VstPatchChunkInfo* in [ptr]
+		ptrOut = sizeof(VstPatchChunkInfo);
+		break;
+
+	default:
+		ASSERT(ptr == nullptr);
+	}
+
+	if(ptrOut != 0 && ptrIsSize)
+	{
+		// In case we only reserve space and don't copy stuff over...
+		dispatchData.resize(sizeof(DispatchMsg) + static_cast<size_t>(ptrOut), 0);
+	}
+
+	const DispatchMsg *resultMsg;
+	{
+		DispatchMsg *msg = reinterpret_cast<DispatchMsg *>(&dispatchData[0]);
+		new (msg) DispatchMsg(opcode, index, value, ptrOut, opt, static_cast<int32_t>(dispatchData.size() - sizeof(DispatchMsg)));
+		resultMsg = static_cast<const DispatchMsg *>(that->SendToBridge(*msg));
+	}
+
+	if(resultMsg == nullptr)
+	{
+		return 0;
+	}
+
+	const char *extraData = reinterpret_cast<const char *>(resultMsg + 1);
+	// Post-fix some opcodes
+	switch(opcode)
+	{
+	case effClose:
+		effect->object = nullptr;
+		delete that;
+		break;
+
+	case effGetProgramName:
+	case effGetParamLabel:
+	case effGetParamDisplay:
+	case effGetParamName:
+	case effString2Parameter:
+	case effGetProgramNameIndexed:
+	case effGetEffectName:
+	case effGetErrorText:
+	case effGetVendorString:
+	case effGetProductString:
+	case effShellGetNextPlugin:
+		// Name in [ptr]
+		strcpy(ptrC, extraData);
+		break;
+
+	case effEditGetRect:
+		// ERect** in [ptr]
+		*static_cast<const ERect **>(ptr) = reinterpret_cast<const ERect *>(extraData);
+		break;
+
+	case effGetChunk:
+		// void** in [ptr] for chunk data address
+		{
+			// Now that we know the chunk size, allocate enough memory for it.
+			dispatchData.resize(sizeof(DispatchMsg) + static_cast<size_t>(resultMsg->result));
+			DispatchMsg *msg = reinterpret_cast<DispatchMsg *>(&dispatchData[0]);
+			new (msg) DispatchMsg(opcode, index, value, resultMsg->result, opt, static_cast<int32_t>(resultMsg->result));
+			resultMsg = static_cast<const DispatchMsg *>(that->SendToBridge(*msg));
+			if(resultMsg != nullptr)
+			{
+				*static_cast<void **>(ptr) = const_cast<DispatchMsg *>(resultMsg + 1);
+			}
+		}
+		break;
+
+	case effGetSpeakerArrangement:
+		// VstSpeakerArrangement* in [value] and [ptr]
+		*static_cast<VstSpeakerArrangement *>(ptr) = *reinterpret_cast<const VstSpeakerArrangement *>(extraData);
+		*FromVstPtr<VstSpeakerArrangement>(value) = *(reinterpret_cast<const VstSpeakerArrangement *>(extraData) + 1);
+		break;
+
+	default:
+		// TODO: Translate VstVariableIo, offline tasks
+		if(copyPtrBack)
+		{
+			memcpy(ptr, extraData, static_cast<size_t>(ptrOut));
+		}
+	}
+
+	return static_cast<VstIntPtr>(resultMsg->result);
+}
+
+
+void VSTCALLBACK BridgeWrapper::SetParameter(AEffect *effect, VstInt32 index, float parameter)
+{
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+	if(that)
+	{
+		that->SendToBridge(ParameterMsg(index, parameter));
+	}
+}
+
+
+float VSTCALLBACK BridgeWrapper::GetParameter(AEffect *effect, VstInt32 index)
+{
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+	if(that)
+	{
+		const ParameterMsg *msg = static_cast<const ParameterMsg *>(that->SendToBridge(ParameterMsg(index)));
+		if(msg != nullptr) return msg->value;
+	}
+	return 0.0f;
+}
+
+
+template<typename buf_t>
+void BridgeWrapper::BuildProcessBuffer(ProcessMsg::ProcessType type, VstInt32 numInputs, VstInt32 numOutputs, buf_t **inputs, buf_t **outputs, VstInt32 sampleFrames)
+{
+	new (sharedMem.sampleBufPtr) ProcessMsg(type, numInputs, numOutputs, sampleFrames);
+
+	buf_t *ptr = reinterpret_cast<buf_t *>(static_cast<ProcessMsg *>(sharedMem.sampleBufPtr) + 1);
+	for(VstInt32 i = 0; i < numInputs; i++)
+	{
+		memcpy(ptr, inputs[i], sampleFrames * sizeof(buf_t));
+		ptr += sampleFrames;
+	}
+	// Theoretically, we should memcpy() instead of memset() here in process(), but OpenMPT always clears the output buffer before processing so it doesn't matter.
+	memset(ptr, 0, numOutputs * sampleFrames * sizeof(buf_t));
+
+	sharedMem.sigProcess.Send();
+	const HANDLE objects[] = { sharedMem.sigProcess.ack, sharedMem.otherProcess };
+	WaitForMultipleObjects(CountOf(objects), objects, FALSE, INFINITE);
+
+	for(VstInt32 i = 0; i < numOutputs; i++)
+	{
+		//memcpy(outputs[i], ptr, sampleFrames * sizeof(buf_t));
+		outputs[i] = ptr;	// Exactly what you don't want plugins to do usually (bend your output pointers)... muahahaha!
+		ptr += sampleFrames;
+	}
+}
+
+
+void VSTCALLBACK BridgeWrapper::Process(AEffect *effect, float **inputs, float **outputs, VstInt32 sampleFrames)
+{
+	// TODO memory size must probably grow!
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+	if(sampleFrames != 0 && that != nullptr)
+	{
+		that->BuildProcessBuffer(ProcessMsg::process, effect->numInputs, effect->numOutputs, inputs, outputs, sampleFrames);
+	}
+}
+
+
+void VSTCALLBACK BridgeWrapper::ProcessReplacing(AEffect *effect, float **inputs, float **outputs, VstInt32 sampleFrames)
+{
+	// TODO memory size must probably grow!
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+	if(sampleFrames != 0 && that != nullptr)
+	{
+		that->BuildProcessBuffer(ProcessMsg::processReplacing, effect->numInputs, effect->numOutputs, inputs, outputs, sampleFrames);
+	}
+}
+
+
+void VSTCALLBACK BridgeWrapper::ProcessDoubleReplacing(AEffect *effect, double **inputs, double **outputs, VstInt32 sampleFrames)
+{
+	// TODO memory size must probably grow!
+	BridgeWrapper *that = static_cast<BridgeWrapper *>(effect->object);
+	if(sampleFrames != 0 && that != nullptr)
+	{
+		that->BuildProcessBuffer(ProcessMsg::processDoubleReplacing, effect->numInputs, effect->numOutputs, inputs, outputs, sampleFrames);
+	}
+}

Added: trunk/OpenMPT/pluginBridge/BridgeWrapper.h
===================================================================
--- trunk/OpenMPT/pluginBridge/BridgeWrapper.h	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/BridgeWrapper.h	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "BridgeCommon.h"
+
+class BridgeWrapper
+{
+protected:
+	// Shared signals and memory
+	SharedMem sharedMem;
+
+public:
+	enum BinaryType
+	{
+		binUnknown = 0,
+		bin32Bit = 32,
+		bin64Bit = 64,
+	};
+
+public:
+	BridgeWrapper(const char *pluginPath);
+	~BridgeWrapper();
+
+	static BinaryType GetPluginBinaryType(const char *pluginPath);
+
+	AEffect *GetEffect() { return sharedMem.mapFile ? sharedMem.effectPtr : nullptr; }
+
+protected:
+
+	static DWORD WINAPI MessageThread(LPVOID param);
+
+	void ParseNextMessage(MsgHeader *parentMessage = nullptr);
+	void DispatchToHost(DispatchMsg *msg);
+	const MsgHeader *SendToBridge(const MsgHeader &msg);
+
+	static VstIntPtr VSTCALLBACK DispatchToPlugin(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt);
+	static void VSTCALLBACK SetParameter(AEffect *effect, VstInt32 index, float parameter);
+	static float VSTCALLBACK GetParameter(AEffect *effect, VstInt32 index);
+	static void VSTCALLBACK Process(AEffect *effect, float **inputs, float **outputs, VstInt32 sampleFrames);
+	static void VSTCALLBACK ProcessReplacing(AEffect *effect, float **inputs, float **outputs, VstInt32 sampleFrames);
+	static void VSTCALLBACK ProcessDoubleReplacing(AEffect *effect, double **inputs, double **outputs, VstInt32 sampleFrames);
+
+	template<typename buf_t>
+	void BuildProcessBuffer(ProcessMsg::ProcessType type, VstInt32 numInputs, VstInt32 numOutputs, buf_t **inputs, buf_t **outputs, VstInt32 sampleFrames);
+};

Added: trunk/OpenMPT/pluginBridge/PluginBridge.filters
===================================================================
--- trunk/OpenMPT/pluginBridge/PluginBridge.filters	                        (rev 0)
+++ trunk/OpenMPT/pluginBridge/PluginBridge.filters	2013-11-04 19:29:54 UTC (rev 3080)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+ ...
 
[truncated message content]

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

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

Revision: 3083
          http://sourceforge.net/p/modplug/code/3083
Author:   manxorist
Date:     2013-11-05 07:49:50 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
[Ref] Move all premake-generated external project files into a common toplevel build/ directory.

Modified Paths:
--------------
    trunk/OpenMPT/include/premake4.lua
    trunk/OpenMPT/mptrack/MPTRACK_08.sln
    trunk/OpenMPT/mptrack/MPTRACK_10.sln
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/openmpt123/openmpt123.sln
    trunk/OpenMPT/openmpt123/openmpt123.vcxproj
    trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj

Added Paths:
-----------
    trunk/OpenMPT/build/
    trunk/OpenMPT/build/UnRAR.vcproj
    trunk/OpenMPT/build/UnRAR.vcxproj
    trunk/OpenMPT/build/UnRAR.vcxproj.filters
    trunk/OpenMPT/build/UnRAR.vcxproj.user
    trunk/OpenMPT/build/flac.vcproj
    trunk/OpenMPT/build/flac.vcxproj
    trunk/OpenMPT/build/flac.vcxproj.filters
    trunk/OpenMPT/build/flac.vcxproj.user
    trunk/OpenMPT/build/lhasa.vcproj
    trunk/OpenMPT/build/lhasa.vcxproj
    trunk/OpenMPT/build/lhasa.vcxproj.filters
    trunk/OpenMPT/build/lhasa.vcxproj.user
    trunk/OpenMPT/build/miniz.vcproj
    trunk/OpenMPT/build/miniz.vcxproj
    trunk/OpenMPT/build/miniz.vcxproj.filters
    trunk/OpenMPT/build/miniz.vcxproj.user
    trunk/OpenMPT/build/minizip.vcproj
    trunk/OpenMPT/build/minizip.vcxproj
    trunk/OpenMPT/build/minizip.vcxproj.filters
    trunk/OpenMPT/build/minizip.vcxproj.user
    trunk/OpenMPT/build/portaudio.vcproj
    trunk/OpenMPT/build/portaudio.vcxproj
    trunk/OpenMPT/build/portaudio.vcxproj.filters
    trunk/OpenMPT/build/portaudio.vcxproj.user
    trunk/OpenMPT/build/portmidi.vcproj
    trunk/OpenMPT/build/portmidi.vcxproj
    trunk/OpenMPT/build/portmidi.vcxproj.filters
    trunk/OpenMPT/build/portmidi.vcxproj.user
    trunk/OpenMPT/build/smbPitchShift.vcproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj.filters
    trunk/OpenMPT/build/smbPitchShift.vcxproj.user
    trunk/OpenMPT/build/soundtouch.vcproj
    trunk/OpenMPT/build/soundtouch.vcxproj
    trunk/OpenMPT/build/soundtouch.vcxproj.filters
    trunk/OpenMPT/build/soundtouch.vcxproj.user
    trunk/OpenMPT/build/zlib.vcproj
    trunk/OpenMPT/build/zlib.vcxproj
    trunk/OpenMPT/build/zlib.vcxproj.filters
    trunk/OpenMPT/build/zlib.vcxproj.user

Removed 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/miniz/miniz.vcxproj.filters
    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/smbPitchShift/smbPitchShift.vcproj
    trunk/OpenMPT/include/smbPitchShift/smbPitchShift.vcxproj
    trunk/OpenMPT/include/smbPitchShift/smbPitchShift.vcxproj.filters
    trunk/OpenMPT/include/soundtouch/soundtouch.vcproj
    trunk/OpenMPT/include/soundtouch/soundtouch.vcxproj
    trunk/OpenMPT/include/soundtouch/soundtouch.vcxproj.filters
    trunk/OpenMPT/include/unrar/UnRAR.vcproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj
    trunk/OpenMPT/include/unrar/UnRAR.vcxproj.filters
    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/include/zlib/zlib.vcxproj.filters

Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build	2013-11-05 07:25:27 UTC (rev 3082)
+++ trunk/OpenMPT/build	2013-11-05 07:49:50 UTC (rev 3083)

Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+obj
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Added: trunk/OpenMPT/build/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcproj	                        (rev 0)
+++ trunk/OpenMPT/build/UnRAR.vcproj	2013-11-05 07:49:50 UTC (rev 3083)
@@ -0,0 +1,961 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="UnRAR"
+	ProjectGUID="{95CC809B-03FC-4EDB-BB20-FD07A698C05F}"
+	RootNamespace="UnRAR"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\include\bin\Debug"
+			IntermediateDirectory="obj\unrar\x32\Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\include\bin\Debug"
+			IntermediateDirectory="obj\unrar\x64\Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Normal|Win32"
+			OutputDirectory="..\include\bin\Normal"
+			IntermediateDirectory="obj\unrar\x32\Normal"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/GL- /MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Normal|x64"
+			OutputDirectory="..\include\bin\Normal"
+			IntermediateDirectory="obj\unrar\x64\Normal"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/GL- /MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\unrar\x32\Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\unrar\x64\Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="..\include\unrar"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\include\unrar"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\UnRAR64.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="include"
+			Filter=""
+			>
+			<Filter
+				Name="unrar"
+				Filter=""
+				>
+				<File
+					RelativePath="..\include\unrar\archive.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\arcread.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\blake2s.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\cmddata.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\consio.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\crc.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\crypt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\encname.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\errhnd.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\extinfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\extract.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filcreat.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\file.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filefn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filestr.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\find.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\getbits.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\global.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\hash.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\headers.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\isnt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\list.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\match.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\options.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\pathfn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\qopen.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rar.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rarpch.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rarvm.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rawread.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rdwrfn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\recvol.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\resource.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rijndael.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rs16.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\scantree.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\secpassword.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\sha1.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\sha256.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\smallfn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\strfn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\strlist.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\system.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\threadpool.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\timefn.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\unicode.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\unpack.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\volume.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\archive.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\array.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\blake2s.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\cmddata.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\coder.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\compress.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\consio.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\crc.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\crypt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\dll.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\encname.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\errhnd.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\extinfo.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\extract.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filcreat.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\file.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filefn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\filestr.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\find.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\getbits.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\global.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\hash.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\headers.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\headers5.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\isnt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\list.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\loclang.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\log.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\match.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\model.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\openmpt.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\openmpt-callback.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\options.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\os.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\pathfn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\qopen.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rar.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rardefs.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rarlang.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\raros.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rartypes.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rarvm.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rawread.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rdwrfn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\recvol.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\resource.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rijndael.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rs.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\rs16.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\savepos.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\scantree.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\secpassword.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\sha1.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\sha256.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\smallfn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\strfn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\strlist.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\suballoc.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\system.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\threadpool.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\timefn.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\ulinks.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\unicode.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\unpack.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\version.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\include\unrar\volume.hpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


Property changes on: trunk/OpenMPT/build/UnRAR.vcproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-vcproj
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: trunk/OpenMPT/build/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj	                        (rev 0)
+++ trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-05 07:49:50 UTC (rev 3083)
@@ -0,0 +1,455 @@
+<?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="Debug|Win32">
+			<Configuration>Debug</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="Debug|x64">
+			<Configuration>Debug</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="Normal|Win32">
+			<Configuration>Normal</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="Normal|x64">
+			<Configuration>Normal</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="Release|Win32">
+			<Configuration>Release</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="Release|x64">
+			<Configuration>Release</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
+	</ItemGroup>
+	<PropertyGroup Label="Globals">
+		<ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
+		<RootNamespace>UnRAR</RootNamespace>
+		<Keyword>Win32Proj</Keyword>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<UseDebugLibraries>true</UseDebugLibraries>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<UseDebugLibraries>true</UseDebugLibraries>
+	</PropertyGroup>
+	<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)'=='Normal|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<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)'=='Release|x64'" Label="Configuration">
+		<ConfigurationType>StaticLibrary</ConfigurationType>
+		<CharacterSet>MultiByte</CharacterSet>
+		<WholeProgramOptimization>true</WholeProgramOptimization>
+		<UseDebugLibraries>false</UseDebugLibraries>
+	</PropertyGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+	<ImportGroup Label="ExtensionSettings">
+	</ImportGroup>
+	<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)'=='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)'=='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)'=='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)'=='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)'=='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)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\unrar\x32\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\unrar\x64\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\unrar\x32\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\unrar\x64\Normal\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">UnRAR64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\unrar\x32\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\unrar\x64\Release\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR64</TargetName>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>true</MinimalRebuild>
+			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>true</MinimalRebuild>
+			<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+			<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<DebugInformationFormat>OldStyle</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="..\include\unrar\archive.hpp" />
+		<ClInclude Include="..\include\unrar\array.hpp" />
+		<ClInclude Include="..\include\unrar\blake2s.hpp" />
+		<ClInclude Include="..\include\unrar\cmddata.hpp" />
+		<ClInclude Include="..\include\unrar\coder.hpp" />
+		<ClInclude Include="..\include\unrar\compress.hpp" />
+		<ClInclude Include="..\include\unrar\consio.hpp" />
+		<ClInclude Include="..\include\unrar\crc.hpp" />
+		<ClInclude Include="..\include\unrar\crypt.hpp" />
+		<ClInclude Include="..\include\unrar\dll.hpp" />
+		<ClInclude Include="..\include\unrar\encname.hpp" />
+		<ClInclude Include="..\include\unrar\errhnd.hpp" />
+		<ClInclude Include="..\include\unrar\extinfo.hpp" />
+		<ClInclude Include="..\include\unrar\extract.hpp" />
+		<ClInclude Include="..\include\unrar\filcreat.hpp" />
+		<ClInclude Include="..\include\unrar\file.hpp" />
+		<ClInclude Include="..\include\unrar\filefn.hpp" />
+		<ClInclude Include="..\include\unrar\filestr.hpp" />
+		<ClInclude Include="..\include\unrar\find.hpp" />
+		<ClInclude Include="..\include\unrar\getbits.hpp" />
+		<ClInclude Include="..\include\unrar\global.hpp" />
+		<ClInclude Include="..\include\unrar\hash.hpp" />
+		<ClInclude Include="..\include\unrar\headers.hpp" />
+		<ClInclude Include="..\include\unrar\headers5.hpp" />
+		<ClInclude Include="..\include\unrar\isnt.hpp" />
+		<ClInclude Include="..\include\unrar\list.hpp" />
+		<ClInclude Include="..\include\unrar\loclang.hpp" />
+		<ClInclude Include="..\include\unrar\log.hpp" />
+		<ClInclude Include="..\include\unrar\match.hpp" />
+		<ClInclude Include="..\include\unrar\model.hpp" />
+		<ClInclude Include="..\include\unrar\openmpt.hpp" />
+		<ClInclude Include="..\include\unrar\openmpt-callback.hpp" />
+		<ClInclude Include="..\include\unrar\options.hpp" />
+		<ClInclude Include="..\include\unrar\os.hpp" />
+		<ClInclude Include="..\include\unrar\pathfn.hpp" />
+		<ClInclude Include="..\include\unrar\qopen.hpp" />
+		<ClInclude Include="..\include\unrar\rar.hpp" />
+		<ClInclude Include="..\include\unrar\rardefs.hpp" />
+		<ClInclude Include="..\include\unrar\rarlang.hpp" />
+		<ClInclude Include="..\include\unrar\raros.hpp" />
+		<ClInclude Include="..\include\unrar\rartypes.hpp" />
+		<ClInclude Include="..\include\unrar\rarvm.hpp" />
+		<ClInclude Include="..\include\unrar\rawread.hpp" />
+		<ClInclude Include="..\include\unrar\rdwrfn.hpp" />
+		<ClInclude Include="..\include\unrar\recvol.hpp" />
+		<ClInclude Include="..\include\unrar\resource.hpp" />
+		<ClInclude Include="..\include\unrar\rijndael.hpp" />
+		<ClInclude Include="..\include\unrar\rs.hpp" />
+		<ClInclude Include="..\include\unrar\rs16.hpp" />
+		<ClInclude Include="..\include\unrar\savepos.hpp" />
+		<ClInclude Include="..\include\unrar\scantree.hpp" />
+		<ClInclude Include="..\include\unrar\secpassword.hpp" />
+		<ClInclude Include="..\include\unrar\sha1.hpp" />
+		<ClInclude Include="..\include\unrar\sha256.hpp" />
+		<ClInclude Include="..\include\unrar\smallfn.hpp" />
+		<ClInclude Include="..\include\unrar\strfn.hpp" />
+		<ClInclude Include="..\include\unrar\strlist.hpp" />
+		<ClInclude Include="..\include\unrar\suballoc.hpp" />
+		<ClInclude Include="..\include\unrar\system.hpp" />
+		<ClInclude Include="..\include\unrar\threadpool.hpp" />
+		<ClInclude Include="..\include\unrar\timefn.hpp" />
+		<ClInclude Include="..\include\unrar\ulinks.hpp" />
+		<ClInclude Include="..\include\unrar\unicode.hpp" />
+		<ClInclude Include="..\include\unrar\unpack.hpp" />
+		<ClInclude Include="..\include\unrar\version.hpp" />
+		<ClInclude Include="..\include\unrar\volume.hpp" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\include\unrar\archive.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\arcread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\blake2s.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\cmddata.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\consio.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\crc.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\crypt.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\encname.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\errhnd.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\extinfo.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\extract.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filcreat.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\file.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filefn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filestr.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\find.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\getbits.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\global.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\hash.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\headers.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\isnt.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\list.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\match.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\options.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\pathfn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\qopen.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rar.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rarpch.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rarvm.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rawread.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rdwrfn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\recvol.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\resource.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rijndael.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rs.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rs16.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\scantree.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\secpassword.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\sha1.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\sha256.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\smallfn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\strfn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\strlist.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\system.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\threadpool.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\timefn.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\unicode.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\unpack.cpp">
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\volume.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets">
+	</ImportGroup>
+</Project>

Added: trunk/OpenMPT/build/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj.filters	                        (rev 0)
+++ trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-05 07:49:50 UTC (rev 3083)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<Filter Include="include">
+			<UniqueIdentifier>{C33E6B99-3E56-A84C-8825-E248657D8D47}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include\unrar">
+			<UniqueIdentifier>{31EF34FC-AB77-3945-A5E4-1B0B566E0A04}</UniqueIdentifier>
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\include\unrar\archive.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\array.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\blake2s.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\cmddata.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\coder.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\compress.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\consio.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\crc.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\crypt.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\dll.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\encname.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\errhnd.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\extinfo.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\extract.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\filcreat.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\file.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\filefn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\filestr.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\find.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\getbits.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\global.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\hash.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\headers.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\headers5.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\isnt.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\list.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\loclang.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\log.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\match.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\model.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\openmpt.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\openmpt-callback.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\options.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\os.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\pathfn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\qopen.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rar.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rardefs.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rarlang.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\raros.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rartypes.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rarvm.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rawread.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rdwrfn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\recvol.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\resource.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rijndael.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rs.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\rs16.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\savepos.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\scantree.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\secpassword.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\sha1.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\sha256.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\smallfn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\strfn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\strlist.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\suballoc.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\system.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\threadpool.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\timefn.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\ulinks.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\unicode.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\unpack.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\version.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+		<ClInclude Include="..\include\unrar\volume.hpp">
+			<Filter>include\unrar</Filter>
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\include\unrar\archive.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\arcread.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\blake2s.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\cmddata.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\consio.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\crc.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\crypt.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\encname.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\errhnd.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\extinfo.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\extract.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filcreat.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\file.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filefn.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\filestr.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\find.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\getbits.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\global.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\hash.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\headers.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\isnt.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\list.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\match.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\options.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\pathfn.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\qopen.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rar.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rarpch.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rarvm.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rawread.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\rdwrfn.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\include\unrar\recvol.cpp">
+			<Filter>include\unrar</Filter>
+		</ClCompile>
+		<ClCompile Include="..\inc...
 
[truncated message content]

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

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

Revision: 3096
          http://sourceforge.net/p/modplug/code/3096
Author:   manxorist
Date:     2013-11-06 12:59:58 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Rename 'Normal' project configuration for included projects to 'ReleaseNoLTCG'.

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

Modified: trunk/OpenMPT/build/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -172,9 +172,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|Win32"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\unrar\x32\Normal"
+			Name="Release|Win32"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\unrar\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -195,7 +195,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\unrar"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -249,9 +249,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|x64"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\unrar\x64\Normal"
+			Name="Release|x64"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\unrar\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -273,7 +273,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\unrar"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -327,9 +327,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\unrar\x32\Release"
+			Name="ReleaseNoLTCG|Win32"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\unrar\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -350,7 +350,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\unrar"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -404,9 +404,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\unrar\x64\Release"
+			Name="ReleaseNoLTCG|x64"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\unrar\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -428,7 +428,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\unrar"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

Modified: trunk/OpenMPT/build/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -9,14 +9,6 @@
 			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|Win32">
-			<Configuration>Normal</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|x64">
-			<Configuration>Normal</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -25,6 +17,14 @@
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|Win32">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|x64">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid>
@@ -42,25 +42,25 @@
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|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)'=='Normal|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -75,16 +75,16 @@
 	<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)'=='Normal|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)'=='Normal|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>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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)'=='Release|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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" />
@@ -96,18 +96,18 @@
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\unrar\x64\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\unrar\x32\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">UnRAR</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\unrar\x64\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">UnRAR64</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\unrar\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\unrar\x64\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\unrar\x32\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\unrar\x64\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR64</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -161,9 +161,9 @@
 			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,9 +191,9 @@
 			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -221,9 +221,9 @@
 			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -251,9 +251,9 @@
 			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
 		<ClCompile>
-			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: trunk/OpenMPT/build/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{C33E6B99-3E56-A84C-8825-E248657D8D47}</UniqueIdentifier>
+			<UniqueIdentifier>{9FE71192-DB6B-5041-A92C-32BDD18C730D}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\unrar">
-			<UniqueIdentifier>{31EF34FC-AB77-3945-A5E4-1B0B566E0A04}</UniqueIdentifier>
+			<UniqueIdentifier>{3A336712-7D81-3948-BA4A-D73201BEA649}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/flac.vcproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/flac.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -176,9 +176,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|Win32"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\flac\x32\Normal"
+			Name="Release|Win32"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\flac\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -199,7 +199,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
+				AdditionalOptions="/wd4267 /wd4334 /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
 				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -254,9 +254,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|x64"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\flac\x64\Normal"
+			Name="Release|x64"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\flac\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
+				AdditionalOptions="/wd4267 /wd4334 /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
 				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -333,9 +333,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\flac\x32\Release"
+			Name="ReleaseNoLTCG|Win32"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\flac\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -356,7 +356,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4267 /wd4334 /MP"
+				AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
 				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -411,9 +411,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\flac\x64\Release"
+			Name="ReleaseNoLTCG|x64"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\flac\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -435,7 +435,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4267 /wd4334 /MP"
+				AdditionalOptions="/wd4267 /wd4334 /GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include"
 				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

Modified: trunk/OpenMPT/build/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/flac.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -9,14 +9,6 @@
 			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|Win32">
-			<Configuration>Normal</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|x64">
-			<Configuration>Normal</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -25,6 +17,14 @@
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|Win32">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|x64">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}</ProjectGuid>
@@ -42,25 +42,25 @@
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|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)'=='Normal|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -75,16 +75,16 @@
 	<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)'=='Normal|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)'=='Normal|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>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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)'=='Release|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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" />
@@ -96,18 +96,18 @@
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\flac\x64\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\flac\x32\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\flac\x64\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">flac64</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\flac\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\flac\x64\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\flac\x32\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\flac\x64\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac64</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -165,9 +165,9 @@
 			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -196,9 +196,9 @@
 			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
-			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -227,9 +227,9 @@
 			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -258,9 +258,9 @@
 			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
 		<ClCompile>
-			<AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: trunk/OpenMPT/build/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{0114BCBA-6E88-444C-AD8F-E46998E4DB08}</UniqueIdentifier>
+			<UniqueIdentifier>{15185494-76EB-8B47-B933-96DB3E256190}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac">
-			<UniqueIdentifier>{8FFEB476-CF16-054B-8D2A-748D6593C6CE}</UniqueIdentifier>
+			<UniqueIdentifier>{593AB6B7-383E-BA42-B1A5-21A12FFC6E17}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src">
-			<UniqueIdentifier>{4CD4FC61-6823-FA43-A510-FADB7D7D6ADC}</UniqueIdentifier>
+			<UniqueIdentifier>{1E7FF733-2E9B-9340-A8DE-6B2D05191C7D}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC">
-			<UniqueIdentifier>{209C5B30-7CF5-274D-9E0A-5315D2820C57}</UniqueIdentifier>
+			<UniqueIdentifier>{93D40968-3ABD-B649-BED6-4EE88041D22C}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include">
-			<UniqueIdentifier>{6ECB279F-BECE-BB43-9AAB-A7E5E154FEF3}</UniqueIdentifier>
+			<UniqueIdentifier>{D79C2522-5B53-1544-9930-D5DFFC6CB112}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\private">
-			<UniqueIdentifier>{6A258816-CB66-6E45-9A4D-A3AD17D1FE43}</UniqueIdentifier>
+			<UniqueIdentifier>{614D2380-3BBF-7E40-88A5-8D045D5D3EB5}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\protected">
-			<UniqueIdentifier>{FDE78CAB-955D-8949-BF79-C5C70623D648}</UniqueIdentifier>
+			<UniqueIdentifier>{55FD65F0-65DC-7546-8F4B-16C46A417DC0}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include">
-			<UniqueIdentifier>{E809B9E3-9947-BC42-BE8B-E0028FC83861}</UniqueIdentifier>
+			<UniqueIdentifier>{DB4C430F-246D-DD49-9B9B-9F3FA19B6E12}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include\FLAC">
-			<UniqueIdentifier>{582616E8-0688-374F-AB49-C19BAB85A06F}</UniqueIdentifier>
+			<UniqueIdentifier>{F9E0C192-74B7-9C4F-A474-F49E35056ADA}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -174,9 +174,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|Win32"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\lhasa\x32\Normal"
+			Name="Release|Win32"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\lhasa\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -197,7 +197,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -252,9 +252,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|x64"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\lhasa\x64\Normal"
+			Name="Release|x64"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\lhasa\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -276,7 +276,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -331,9 +331,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\lhasa\x32\Release"
+			Name="ReleaseNoLTCG|Win32"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\lhasa\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
@@ -409,9 +409,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\lhasa\x64\Release"
+			Name="ReleaseNoLTCG|x64"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\lhasa\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -433,7 +433,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

Modified: trunk/OpenMPT/build/lhasa.vcxproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -9,14 +9,6 @@
 			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|Win32">
-			<Configuration>Normal</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|x64">
-			<Configuration>Normal</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -25,6 +17,14 @@
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|Win32">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|x64">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{6B11F6A8-B131-4D2B-80EF-5731A9016436}</ProjectGuid>
@@ -42,25 +42,25 @@
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|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)'=='Normal|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -75,16 +75,16 @@
 	<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)'=='Normal|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)'=='Normal|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>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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)'=='Release|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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" />
@@ -96,18 +96,18 @@
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\lhasa\x64\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\lhasa\x32\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\lhasa\x64\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">lhasa64</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\lhasa\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lhasa</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\lhasa\x64\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\lhasa\x32\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\lhasa\x64\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa64</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -163,9 +163,9 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -194,9 +194,9 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -225,9 +225,9 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -256,9 +256,9 @@
 			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
 		<ClCompile>
-			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: trunk/OpenMPT/build/lhasa.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{5D81F21A-1E84-0A47-A28E-CFC5D0389760}</UniqueIdentifier>
+			<UniqueIdentifier>{19494FDD-2706-8347-962A-7DAEA0E8CC3B}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa">
-			<UniqueIdentifier>{311363F1-7C18-0C42-8AAB-77B071F11462}</UniqueIdentifier>
+			<UniqueIdentifier>{1A2C2CCD-C268-3946-97B3-AF6438E24160}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib">
-			<UniqueIdentifier>{58672F74-331E-D147-BD11-CFC740EA2957}</UniqueIdentifier>
+			<UniqueIdentifier>{28F6BA1F-75E0-5C40-AD75-5160411D3127}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib\public">
-			<UniqueIdentifier>{46F8A074-951F-4F41-825F-9084BE47C89A}</UniqueIdentifier>
+			<UniqueIdentifier>{44CA7BAC-69A4-4B49-81F6-FC57357E1B06}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/miniz.vcproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/miniz.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -170,9 +170,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|Win32"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\miniz\x32\Normal"
+			Name="Release|Win32"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\miniz\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -193,7 +193,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
@@ -246,9 +246,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Normal|x64"
-			OutputDirectory="..\include\bin\Normal"
-			IntermediateDirectory="obj\miniz\x64\Normal"
+			Name="Release|x64"
+			OutputDirectory="..\include\bin\Release"
+			IntermediateDirectory="obj\miniz\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -270,7 +270,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/GL- /MP"
+				AdditionalOptions="/MP"
 				Optimization="3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
@@ -323,9 +323,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\miniz\x32\Release"
+			Name="ReleaseNoLTCG|Win32"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\miniz\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -346,7 +346,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"
@@ -399,9 +399,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
-			IntermediateDirectory="obj\miniz\x64\Release"
+			Name="ReleaseNoLTCG|x64"
+			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			IntermediateDirectory="obj\miniz\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -423,7 +423,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
+				AdditionalOptions="/GL- /MP"
 				Optimization="3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
 				StringPooling="true"

Modified: trunk/OpenMPT/build/miniz.vcxproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 12:44:23 UTC (rev 3095)
+++ trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
@@ -9,14 +9,6 @@
 			<Configuration>Debug</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|Win32">
-			<Configuration>Normal</Configuration>
-			<Platform>Win32</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Normal|x64">
-			<Configuration>Normal</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
 		<ProjectConfiguration Include="Release|Win32">
 			<Configuration>Release</Configuration>
 			<Platform>Win32</Platform>
@@ -25,6 +17,14 @@
 			<Configuration>Release</Configuration>
 			<Platform>x64</Platform>
 		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|Win32">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>Win32</Platform>
+		</ProjectConfiguration>
+		<ProjectConfiguration Include="ReleaseNoLTCG|x64">
+			<Configuration>ReleaseNoLTCG</Configuration>
+			<Platform>x64</Platform>
+		</ProjectConfiguration>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}</ProjectGuid>
@@ -42,25 +42,25 @@
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|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)'=='Normal|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
 		<UseDebugLibraries>false</UseDebugLibraries>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration">
 		<ConfigurationType>StaticLibrary</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -75,16 +75,16 @@
 	<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)'=='Normal|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)'=='Normal|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>
-	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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)'=='Release|x64'" Label="PropertySheets">
+	<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|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" />
@@ -96,18 +96,18 @@
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\miniz\x64\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\miniz\x32\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\miniz\x64\Normal\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">miniz64</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\miniz\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">miniz</TargetName>
 		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\miniz\x64\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz64</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\miniz\x32\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\miniz\x64\ReleaseNoLTCG\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz64</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -159,9 +159,9 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
@@ -188,9 +188,9 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<ClCompile>
-			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<MinimalRebuild>false</MinimalRebuild>
@@ -217,9 +217,9 @@
 			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
-	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
 		<ClCompile>
-			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
 			<Optimization>Full</Optimization>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<...
 
[truncated message content]

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

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

Revision: 3097
          http://sourceforge.net/p/modplug/code/3097
Author:   manxorist
Date:     2013-11-06 15:34:12 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Move all VS2010 mptrack related binaries to toplevel bin/$PLATFORM . (VS2008 and library projects will follow later).
[Int] Move all VS2010 mptrack temporary files to build/obj or build/lib . (VS2008 and library projects will follow later).
[Ref] Cleanup VS2010 project files (i.e. remove all options (mainly path names) that are set to the equivalent of the default value (or to a value that fits our needs just as good)). This makes the project settings less confusing without any functional change.
[Fix] Adjust path detection for test cases.
[Int] Remove old bin/ directories.
[Mod] Remove "64" suffix from included win64 libraries.

Modified Paths:
--------------
    trunk/OpenMPT/build/UnRAR.vcproj
    trunk/OpenMPT/build/UnRAR.vcxproj
    trunk/OpenMPT/build/UnRAR.vcxproj.filters
    trunk/OpenMPT/build/flac.vcproj
    trunk/OpenMPT/build/flac.vcxproj
    trunk/OpenMPT/build/flac.vcxproj.filters
    trunk/OpenMPT/build/lhasa.vcproj
    trunk/OpenMPT/build/lhasa.vcxproj
    trunk/OpenMPT/build/lhasa.vcxproj.filters
    trunk/OpenMPT/build/miniz.vcproj
    trunk/OpenMPT/build/miniz.vcxproj
    trunk/OpenMPT/build/miniz.vcxproj.filters
    trunk/OpenMPT/build/minizip.vcproj
    trunk/OpenMPT/build/minizip.vcxproj
    trunk/OpenMPT/build/minizip.vcxproj.filters
    trunk/OpenMPT/build/portaudio.vcproj
    trunk/OpenMPT/build/portaudio.vcxproj
    trunk/OpenMPT/build/portaudio.vcxproj.filters
    trunk/OpenMPT/build/portmidi.vcproj
    trunk/OpenMPT/build/portmidi.vcxproj
    trunk/OpenMPT/build/portmidi.vcxproj.filters
    trunk/OpenMPT/build/smbPitchShift.vcproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj.filters
    trunk/OpenMPT/build/soundtouch.vcproj
    trunk/OpenMPT/build/soundtouch.vcxproj
    trunk/OpenMPT/build/soundtouch.vcxproj.filters
    trunk/OpenMPT/build/zlib.vcproj
    trunk/OpenMPT/build/zlib.vcxproj
    trunk/OpenMPT/build/zlib.vcxproj.filters
    trunk/OpenMPT/include/premake4-defaults-DLL.lua
    trunk/OpenMPT/include/premake4-defaults.lua
    trunk/OpenMPT/installer/install.iss
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj
    trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
    trunk/OpenMPT/test/test.cpp

Added Paths:
-----------
    trunk/OpenMPT/bin/

Removed Paths:
-------------
    trunk/OpenMPT/mptrack/bin/
    trunk/OpenMPT/plugins/bin/

Property Changed:
----------------
    trunk/OpenMPT/
    trunk/OpenMPT/build/

Index: trunk/OpenMPT
===================================================================
--- trunk/OpenMPT	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT	2013-11-06 15:34:12 UTC (rev 3097)

Property changes on: trunk/OpenMPT
___________________________________________________________________
Modified: svn:ignore
## -1,6 +1,6 ##
 Debug
 Release
 ipch
+libopenmpt.opensdf
 libopenmpt.sdf
-libopenmpt.opensdf
 libopenmpt.suo
Index: trunk/OpenMPT/bin
===================================================================
--- trunk/OpenMPT/bin	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/bin	2013-11-06 15:34:12 UTC (rev 3097)

Property changes on: trunk/OpenMPT/bin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build	2013-11-06 15:34:12 UTC (rev 3097)

Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
+lib
 obj
Modified: trunk/OpenMPT/build/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\unrar\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -96,7 +96,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\unrar\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -128,7 +128,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\UnRAR64.lib"
+				OutputFile="$(OutDir)\UnRAR.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -173,7 +173,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\unrar\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -250,7 +250,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\unrar\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -283,7 +283,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -299,7 +299,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\UnRAR64.lib"
+				OutputFile="$(OutDir)\UnRAR.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -328,7 +328,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\unrar\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -405,7 +405,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\unrar\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -438,7 +438,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\UnRAR64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -454,7 +454,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\UnRAR64.lib"
+				OutputFile="$(OutDir)\UnRAR.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\unrar\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UnRAR</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\unrar\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\unrar\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\unrar\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\unrar\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">UnRAR</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\unrar\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -153,12 +153,12 @@
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -211,14 +211,14 @@
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -271,14 +271,14 @@
 			<AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)UnRAR64.lib</OutputFile>
+		<OutputFile>$(OutDir)UnRAR.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{9FE71192-DB6B-5041-A92C-32BDD18C730D}</UniqueIdentifier>
+			<UniqueIdentifier>{51B7AB45-ACC4-A449-9AF7-00C9FCCFB1D3}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\unrar">
-			<UniqueIdentifier>{3A336712-7D81-3948-BA4A-D73201BEA649}</UniqueIdentifier>
+			<UniqueIdentifier>{9F0BFE6F-155F-6846-918A-6175DC85C5E7}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/flac.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\flac\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -98,7 +98,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\flac\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -131,7 +131,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\flac64.lib"
+				OutputFile="$(OutDir)\flac.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -177,7 +177,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\flac\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -255,7 +255,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\flac\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -288,7 +288,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -305,7 +305,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\flac64.lib"
+				OutputFile="$(OutDir)\flac.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -334,7 +334,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\flac\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -412,7 +412,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\flac\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -445,7 +445,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -462,7 +462,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\flac64.lib"
+				OutputFile="$(OutDir)\flac.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\flac\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\flac\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\flac\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\flac\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\flac\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">flac</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\flac\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -157,12 +157,12 @@
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -217,14 +217,14 @@
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -279,14 +279,14 @@
 			<AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{15185494-76EB-8B47-B933-96DB3E256190}</UniqueIdentifier>
+			<UniqueIdentifier>{BC279AC7-C6B4-AE41-9ECC-A7C52B3C8A0D}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac">
-			<UniqueIdentifier>{593AB6B7-383E-BA42-B1A5-21A12FFC6E17}</UniqueIdentifier>
+			<UniqueIdentifier>{3CFFBEDE-7D8E-A945-A8EC-D6F443D35E0A}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src">
-			<UniqueIdentifier>{1E7FF733-2E9B-9340-A8DE-6B2D05191C7D}</UniqueIdentifier>
+			<UniqueIdentifier>{95A41CB5-5215-8D4F-8396-C62A7188EFEA}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC">
-			<UniqueIdentifier>{93D40968-3ABD-B649-BED6-4EE88041D22C}</UniqueIdentifier>
+			<UniqueIdentifier>{520298DF-75E3-F349-A4A1-6EFED0096B06}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include">
-			<UniqueIdentifier>{D79C2522-5B53-1544-9930-D5DFFC6CB112}</UniqueIdentifier>
+			<UniqueIdentifier>{E982D50B-C72D-B142-B902-2654348C1634}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\private">
-			<UniqueIdentifier>{614D2380-3BBF-7E40-88A5-8D045D5D3EB5}</UniqueIdentifier>
+			<UniqueIdentifier>{6A4252D2-AFB2-484A-9255-12EE5A59463A}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\protected">
-			<UniqueIdentifier>{55FD65F0-65DC-7546-8F4B-16C46A417DC0}</UniqueIdentifier>
+			<UniqueIdentifier>{C5A39CAF-4859-6C44-A0BC-8B8CAA772238}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include">
-			<UniqueIdentifier>{DB4C430F-246D-DD49-9B9B-9F3FA19B6E12}</UniqueIdentifier>
+			<UniqueIdentifier>{1B8F9693-09EE-2147-815C-476B021C5415}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include\FLAC">
-			<UniqueIdentifier>{F9E0C192-74B7-9C4F-A474-F49E35056ADA}</UniqueIdentifier>
+			<UniqueIdentifier>{7ACCC449-A61B-0F47-A15B-DDF1E1736629}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\lhasa\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -97,7 +97,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\lhasa\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -129,7 +129,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -146,7 +146,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lhasa64.lib"
+				OutputFile="$(OutDir)\lhasa.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -175,7 +175,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\lhasa\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -253,7 +253,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\lhasa\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -286,7 +286,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -303,7 +303,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lhasa64.lib"
+				OutputFile="$(OutDir)\lhasa.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -332,7 +332,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\lhasa\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -410,7 +410,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\lhasa\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -443,7 +443,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\lhasa64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -460,7 +460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lhasa64.lib"
+				OutputFile="$(OutDir)\lhasa.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/lhasa.vcxproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\lhasa\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\lhasa\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\lhasa\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\lhasa\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\lhasa\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lhasa</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\lhasa\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -155,12 +155,12 @@
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+		<OutputFile>$(OutDir)lhasa.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -215,14 +215,14 @@
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+		<OutputFile>$(OutDir)lhasa.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -277,14 +277,14 @@
 			<AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)lhasa64.lib</OutputFile>
+		<OutputFile>$(OutDir)lhasa.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/lhasa.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{19494FDD-2706-8347-962A-7DAEA0E8CC3B}</UniqueIdentifier>
+			<UniqueIdentifier>{5C28B7BC-E688-F04C-AA7A-4C818FF0B931}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa">
-			<UniqueIdentifier>{1A2C2CCD-C268-3946-97B3-AF6438E24160}</UniqueIdentifier>
+			<UniqueIdentifier>{E594F94D-4264-C845-85EE-136F04FDC899}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib">
-			<UniqueIdentifier>{28F6BA1F-75E0-5C40-AD75-5160411D3127}</UniqueIdentifier>
+			<UniqueIdentifier>{D40C9477-3313-964A-979A-69394903E541}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib\public">
-			<UniqueIdentifier>{44CA7BAC-69A4-4B49-81F6-FC57357E1B06}</UniqueIdentifier>
+			<UniqueIdentifier>{8DFECA0F-7BAD-204D-913B-C35F91525497}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/miniz.vcproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\miniz\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -95,7 +95,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\miniz\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -126,7 +126,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -142,7 +142,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\miniz64.lib"
+				OutputFile="$(OutDir)\miniz.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -171,7 +171,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\miniz\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -247,7 +247,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\miniz\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -279,7 +279,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -295,7 +295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\miniz64.lib"
+				OutputFile="$(OutDir)\miniz.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -324,7 +324,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\miniz\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -400,7 +400,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\miniz\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -432,7 +432,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\miniz64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -448,7 +448,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\miniz64.lib"
+				OutputFile="$(OutDir)\miniz.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/miniz.vcxproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\miniz\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\miniz\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\miniz\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\miniz\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\miniz\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">miniz</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\miniz\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -151,12 +151,12 @@
 			<PreprocessorDefinitions>DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)miniz64.lib</OutputFile>
+		<OutputFile>$(OutDir)miniz.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -207,14 +207,14 @@
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)miniz64.lib</OutputFile>
+		<OutputFile>$(OutDir)miniz.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -265,14 +265,14 @@
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)miniz64.lib</OutputFile>
+		<OutputFile>$(OutDir)miniz.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/miniz.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/miniz.vcxproj.filters	2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{6B048AFC-489B-C74E-9268-5E73B3846663}</UniqueIdentifier>
+			<UniqueIdentifier>{97148828-3006-8947-A52E-EC3FF6B45E77}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\miniz">
-			<UniqueIdentifier>{65774DFA-D430-984F-B926-8C0C5A58077A}</UniqueIdentifier>
+			<UniqueIdentifier>{6643FDE6-C22E-B042-81AF-FE904E9F7D76}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/minizip.vcproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\minizip\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -97,7 +97,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\minizip\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -129,7 +129,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -146,7 +146,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\minizip64.lib"
+				OutputFile="$(OutDir)\minizip.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -175,7 +175,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\minizip\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -253,7 +253,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\minizip\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -286,7 +286,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -303,7 +303,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\minizip64.lib"
+				OutputFile="$(OutDir)\minizip.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -332,7 +332,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\minizip\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -410,7 +410,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\minizip\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -443,7 +443,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\minizip64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -460,7 +460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\minizip64.lib"
+				OutputFile="$(OutDir)\minizip.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/minizip.vcxproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\minizip\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">minizip</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\minizip\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizip64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizip</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\minizip\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">minizip</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\minizip\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\minizip\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">minizip</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\minizip\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">minizip64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">minizip</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -155,12 +155,12 @@
 			<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)minizip64.lib</OutputFile>
+		<OutputFile>$(OutDir)minizip.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -215,14 +215,14 @@
 			<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)minizip64.lib</OutputFile>
+		<OutputFile>$(OutDir)minizip.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -277,14 +277,14 @@
 			<AdditionalIncludeDirectories>..\include\zlib;..\include\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)minizip64.lib</OutputFile>
+		<OutputFile>$(OutDir)minizip.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)minizip64.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/minizip.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj.filters	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/minizip.vcxproj.filters	2013-11-06 15:34:12 UTC (rev 3097)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{E915CF12-4BFB-AF44-85BF-7D6CAEEF50F5}</UniqueIdentifier>
+			<UniqueIdentifier>{68E4E657-7DF1-0C4B-8987-D76FD8397852}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib">
-			<UniqueIdentifier>{B8A0A8EE-3677-A744-B03D-3F426C7B8AE7}</UniqueIdentifier>
+			<UniqueIdentifier>{15B45470-842E-9B43-B697-6023C422B24E}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib\contrib">
-			<UniqueIdentifier>{992492FE-4C62-D34A-B088-B2E247004530}</UniqueIdentifier>
+			<UniqueIdentifier>{63B7D41F-8A1F-C241-A874-442FA1EAA018}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib\contrib\minizip">
-			<UniqueIdentifier>{30FA0556-9AC8-8A4E-BE11-5436EF8E34E7}</UniqueIdentifier>
+			<UniqueIdentifier>{EF7621CA-D165-674C-803F-38D7C80333B9}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/portaudio.vcproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/portaudio.vcproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x32\Debug"
 			IntermediateDirectory="obj\portaudio\x32\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -98,7 +98,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\include\bin\Debug"
+			OutputDirectory="lib\x64\Debug"
 			IntermediateDirectory="obj\portaudio\x64\Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -131,7 +131,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -148,7 +148,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\portaudio64.lib"
+				OutputFile="$(OutDir)\portaudio.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -177,7 +177,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x32\Release"
 			IntermediateDirectory="obj\portaudio\x32\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -255,7 +255,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\include\bin\Release"
+			OutputDirectory="lib\x64\Release"
 			IntermediateDirectory="obj\portaudio\x64\Release"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -288,7 +288,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -305,7 +305,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\portaudio64.lib"
+				OutputFile="$(OutDir)\portaudio.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -334,7 +334,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|Win32"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x32\ReleaseNoLTCG"
 			IntermediateDirectory="obj\portaudio\x32\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -412,7 +412,7 @@
 		</Configuration>
 		<Configuration
 			Name="ReleaseNoLTCG|x64"
-			OutputDirectory="..\include\bin\ReleaseNoLTCG"
+			OutputDirectory="lib\x64\ReleaseNoLTCG"
 			IntermediateDirectory="obj\portaudio\x64\ReleaseNoLTCG"
 			ConfigurationType="4"
 			CharacterSet="2"
@@ -445,7 +445,7 @@
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				ProgramDataBaseFileName="$(OutDir)\portaudio64.pdb"
+				ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -462,7 +462,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\portaudio64.lib"
+				OutputFile="$(OutDir)\portaudio.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/OpenMPT/build/portaudio.vcxproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcxproj	2013-11-06 12:59:58 UTC (rev 3096)
+++ trunk/OpenMPT/build/portaudio.vcxproj	2013-11-06 15:34:12 UTC (rev 3097)
@@ -90,24 +90,24 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x32\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\portaudio\x32\Debug\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">portaudio</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\Debug\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\portaudio\x64\Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">portaudio64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">portaudio</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x32\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\portaudio\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">portaudio</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\Release\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\portaudio\x64\Release\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">portaudio64</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">portaudio</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lib\x32\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\portaudio\x32\ReleaseNoLTCG\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">portaudio</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lib\x64\ReleaseNoLTCG\</OutDir>
 		<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\portaudio\x64\ReleaseNoLTCG\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">portaudio64</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">portaudio</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@@ -157,12 +157,12 @@
 			<AdditionalIncludeDirectories>..\include\portaudio\include;..\include\portaudio\src\common;..\include\portaudio\src\os\win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)portaudio64.lib</OutputFile>
+		<OutputFile>$(OutDir)portaudio.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)portaudio64.pdb</ProgramDataBaseFil...
 
[truncated message content]

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

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

Revision: 3102
          http://sourceforge.net/p/modplug/code/3102
Author:   manxorist
Date:     2013-11-06 17:05:42 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Do not generate debug information for ReleaseNoLTCG builds. Speeds up build times by about another 10%.

Modified Paths:
--------------
    trunk/OpenMPT/build/UnRAR.vcproj
    trunk/OpenMPT/build/UnRAR.vcxproj
    trunk/OpenMPT/build/UnRAR.vcxproj.filters
    trunk/OpenMPT/build/flac.vcproj
    trunk/OpenMPT/build/flac.vcxproj
    trunk/OpenMPT/build/flac.vcxproj.filters
    trunk/OpenMPT/build/lhasa.vcproj
    trunk/OpenMPT/build/lhasa.vcxproj
    trunk/OpenMPT/build/lhasa.vcxproj.filters
    trunk/OpenMPT/build/miniz.vcproj
    trunk/OpenMPT/build/miniz.vcxproj
    trunk/OpenMPT/build/miniz.vcxproj.filters
    trunk/OpenMPT/build/minizip.vcproj
    trunk/OpenMPT/build/minizip.vcxproj
    trunk/OpenMPT/build/minizip.vcxproj.filters
    trunk/OpenMPT/build/portaudio.vcproj
    trunk/OpenMPT/build/portaudio.vcxproj
    trunk/OpenMPT/build/portaudio.vcxproj.filters
    trunk/OpenMPT/build/portmidi.vcproj
    trunk/OpenMPT/build/portmidi.vcxproj
    trunk/OpenMPT/build/portmidi.vcxproj.filters
    trunk/OpenMPT/build/smbPitchShift.vcproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj
    trunk/OpenMPT/build/smbPitchShift.vcxproj.filters
    trunk/OpenMPT/build/soundtouch.vcproj
    trunk/OpenMPT/build/soundtouch.vcxproj
    trunk/OpenMPT/build/soundtouch.vcxproj.filters
    trunk/OpenMPT/build/zlib.vcproj
    trunk/OpenMPT/build/zlib.vcxproj
    trunk/OpenMPT/build/zlib.vcxproj.filters
    trunk/OpenMPT/include/premake4-defaults-DLL.lua
    trunk/OpenMPT/include/premake4-defaults.lua
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj

Modified: trunk/OpenMPT/build/UnRAR.vcproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/UnRAR.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -361,7 +361,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -439,7 +439,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\UnRAR.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: trunk/OpenMPT/build/UnRAR.vcxproj
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/UnRAR.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -234,7 +234,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -245,10 +245,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -264,7 +263,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -275,10 +274,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/UnRAR.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/UnRAR.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{51B7AB45-ACC4-A449-9AF7-00C9FCCFB1D3}</UniqueIdentifier>
+			<UniqueIdentifier>{51767C19-EBB5-3448-8D82-2C4A76FF7978}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\unrar">
-			<UniqueIdentifier>{9F0BFE6F-155F-6846-918A-6175DC85C5E7}</UniqueIdentifier>
+			<UniqueIdentifier>{1C42A34F-03C5-A940-9043-178F6FD772A9}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/flac.vcproj
===================================================================
--- trunk/OpenMPT/build/flac.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/flac.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -367,7 +367,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -446,7 +446,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/flac.vcxproj
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/flac.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -240,7 +240,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -252,10 +252,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -271,7 +270,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -283,10 +282,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/flac.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/flac.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{BC279AC7-C6B4-AE41-9ECC-A7C52B3C8A0D}</UniqueIdentifier>
+			<UniqueIdentifier>{8D73C555-D4B8-2D41-AA64-549185F6A866}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac">
-			<UniqueIdentifier>{3CFFBEDE-7D8E-A945-A8EC-D6F443D35E0A}</UniqueIdentifier>
+			<UniqueIdentifier>{7DBFD967-716A-5D4C-ADB7-87AD1E067B04}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src">
-			<UniqueIdentifier>{95A41CB5-5215-8D4F-8396-C62A7188EFEA}</UniqueIdentifier>
+			<UniqueIdentifier>{D7462892-CBBF-FF43-9AAB-B693D2FBDC29}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC">
-			<UniqueIdentifier>{520298DF-75E3-F349-A4A1-6EFED0096B06}</UniqueIdentifier>
+			<UniqueIdentifier>{EF8383C6-ED33-B646-902E-3CAC851D6EC9}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include">
-			<UniqueIdentifier>{E982D50B-C72D-B142-B902-2654348C1634}</UniqueIdentifier>
+			<UniqueIdentifier>{81BF1A39-AD5A-8E42-AE15-62BE0CE41E4C}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\private">
-			<UniqueIdentifier>{6A4252D2-AFB2-484A-9255-12EE5A59463A}</UniqueIdentifier>
+			<UniqueIdentifier>{FE262055-A0D1-3744-9497-258BCA1F6C01}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\src\libFLAC\include\protected">
-			<UniqueIdentifier>{C5A39CAF-4859-6C44-A0BC-8B8CAA772238}</UniqueIdentifier>
+			<UniqueIdentifier>{FF7B7C17-1823-974C-89DA-FF2A5247C924}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include">
-			<UniqueIdentifier>{1B8F9693-09EE-2147-815C-476B021C5415}</UniqueIdentifier>
+			<UniqueIdentifier>{0990FB44-4019-D04E-BB03-72B126850B59}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\flac\include\FLAC">
-			<UniqueIdentifier>{7ACCC449-A61B-0F47-A15B-DDF1E1736629}</UniqueIdentifier>
+			<UniqueIdentifier>{1150D860-3747-1442-B79E-D73527226503}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/lhasa.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -365,7 +365,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\lhasa.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/lhasa.vcxproj
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/lhasa.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -238,7 +238,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -250,10 +250,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -269,7 +268,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -281,10 +280,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/lhasa.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/lhasa.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{5C28B7BC-E688-F04C-AA7A-4C818FF0B931}</UniqueIdentifier>
+			<UniqueIdentifier>{57BB3C0A-4A1D-D048-B470-7CF98B0CBDCB}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa">
-			<UniqueIdentifier>{E594F94D-4264-C845-85EE-136F04FDC899}</UniqueIdentifier>
+			<UniqueIdentifier>{7412795A-0437-7643-B5D9-22E06ED9098C}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib">
-			<UniqueIdentifier>{D40C9477-3313-964A-979A-69394903E541}</UniqueIdentifier>
+			<UniqueIdentifier>{931B1DF3-70F2-8740-803C-39C953DD9FEC}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\lhasa\lib\public">
-			<UniqueIdentifier>{8DFECA0F-7BAD-204D-913B-C35F91525497}</UniqueIdentifier>
+			<UniqueIdentifier>{C54B6B76-3F76-EE45-A718-EC0297A09AEF}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/miniz.vcproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/miniz.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -356,7 +356,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -433,7 +433,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\miniz.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/miniz.vcxproj
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/miniz.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -229,7 +229,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -240,10 +240,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -258,7 +257,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -269,10 +268,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/miniz.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/miniz.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/miniz.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{97148828-3006-8947-A52E-EC3FF6B45E77}</UniqueIdentifier>
+			<UniqueIdentifier>{15789938-0F62-9846-8B2C-2797DE8CE25D}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\miniz">
-			<UniqueIdentifier>{6643FDE6-C22E-B042-81AF-FE904E9F7D76}</UniqueIdentifier>
+			<UniqueIdentifier>{46064C07-37BC-A344-8CAE-C7B09727E3F8}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/minizip.vcproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/minizip.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -365,7 +365,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\minizip.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/minizip.vcxproj
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/minizip.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -238,7 +238,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -250,10 +250,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -269,7 +268,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -281,10 +280,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)minizip.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/minizip.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/minizip.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/minizip.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{68E4E657-7DF1-0C4B-8987-D76FD8397852}</UniqueIdentifier>
+			<UniqueIdentifier>{7457BDD8-5A7E-3645-AA83-D02E7EA0B204}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib">
-			<UniqueIdentifier>{15B45470-842E-9B43-B697-6023C422B24E}</UniqueIdentifier>
+			<UniqueIdentifier>{75761BC3-8F76-2248-AEE3-4A454563635E}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib\contrib">
-			<UniqueIdentifier>{63B7D41F-8A1F-C241-A874-442FA1EAA018}</UniqueIdentifier>
+			<UniqueIdentifier>{2EC4A12B-43A7-744E-B99F-8657B723A342}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib\contrib\minizip">
-			<UniqueIdentifier>{EF7621CA-D165-674C-803F-38D7C80333B9}</UniqueIdentifier>
+			<UniqueIdentifier>{412A0F97-BBA5-A549-98DC-1F287CA99178}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/portaudio.vcproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portaudio.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -367,7 +367,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -446,7 +446,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\portaudio.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/portaudio.vcxproj
===================================================================
--- trunk/OpenMPT/build/portaudio.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portaudio.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -240,7 +240,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -252,10 +252,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)portaudio.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -271,7 +270,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -283,10 +282,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)portaudio.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/portaudio.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/portaudio.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portaudio.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{455A4AD8-7F19-1740-A2A1-A81AEC2A2F2A}</UniqueIdentifier>
+			<UniqueIdentifier>{99BAB021-4C99-B348-AACF-344FF1726439}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio">
-			<UniqueIdentifier>{E99D1DCD-EDEA-7E4E-8A84-E0D59D218607}</UniqueIdentifier>
+			<UniqueIdentifier>{D2161D54-E60D-4948-9B9B-6621A6F13F1E}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src">
-			<UniqueIdentifier>{A8E9B71E-9412-6349-AC9B-333F61821F72}</UniqueIdentifier>
+			<UniqueIdentifier>{CCDEC5E6-B32E-8F4B-A293-B270A6FDEA57}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\common">
-			<UniqueIdentifier>{13AE8E55-FE11-3B4B-93A7-000039535B61}</UniqueIdentifier>
+			<UniqueIdentifier>{E8114CF1-7723-C44D-B4BA-96860ABFF466}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\os">
-			<UniqueIdentifier>{4699E520-3AE4-6141-9093-087992BBB213}</UniqueIdentifier>
+			<UniqueIdentifier>{92F393FF-B386-A341-8B42-084868C204C3}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\os\win">
-			<UniqueIdentifier>{A2B3933A-ECC3-734E-975A-8B46190AE1EB}</UniqueIdentifier>
+			<UniqueIdentifier>{D4A91A02-C132-E04A-B855-8BA1E09891EA}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\include">
-			<UniqueIdentifier>{58D3A6A2-25AA-2F40-8257-E52743AE99F7}</UniqueIdentifier>
+			<UniqueIdentifier>{98E537E0-14E1-C846-9D02-21198A309310}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\hostapi">
-			<UniqueIdentifier>{8C14202C-0574-8345-BB77-34EA1BAA9DF1}</UniqueIdentifier>
+			<UniqueIdentifier>{7F49FF6C-1F50-314E-8053-020031A8F958}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\hostapi\skeleton">
-			<UniqueIdentifier>{588B0977-E6B3-854B-9190-98A3D6B7CC77}</UniqueIdentifier>
+			<UniqueIdentifier>{67499B7B-1D18-C64C-B2BA-9740036B1C73}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\hostapi\wasapi">
-			<UniqueIdentifier>{DD60F2D1-ACB0-D047-AD86-46423AB4AE28}</UniqueIdentifier>
+			<UniqueIdentifier>{80A199BB-F4EE-074A-8ED7-A9575E35A0DE}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\hostapi\wdmks">
-			<UniqueIdentifier>{8D97D935-B3C7-6E48-A743-FF00CED9224D}</UniqueIdentifier>
+			<UniqueIdentifier>{7BC7FC30-D490-2845-8ABB-8DE5C2B2ABC3}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portaudio\src\hostapi\wmme">
-			<UniqueIdentifier>{83CD4FDE-848C-0146-ADE4-6F769FAC0465}</UniqueIdentifier>
+			<UniqueIdentifier>{DAF7B18E-6E41-3345-B6D2-80EC5392B14D}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/portmidi.vcproj
===================================================================
--- trunk/OpenMPT/build/portmidi.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portmidi.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -365,7 +365,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\portmidi.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\portmidi.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/portmidi.vcxproj
===================================================================
--- trunk/OpenMPT/build/portmidi.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portmidi.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -238,7 +238,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -250,10 +250,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)portmidi.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -269,7 +268,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -281,10 +280,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)portmidi.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/portmidi.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/portmidi.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/portmidi.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,19 +2,19 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{6114E260-E1F8-6947-B349-7622E3BDC753}</UniqueIdentifier>
+			<UniqueIdentifier>{DE42D4D6-D78D-3647-B5AC-229A6B1C1B9F}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portmidi">
-			<UniqueIdentifier>{50CA398F-F2AC-E645-AF4A-DBC1FFA5B4CD}</UniqueIdentifier>
+			<UniqueIdentifier>{680620DC-F840-D64C-A2EB-7E69166C3D77}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portmidi\porttime">
-			<UniqueIdentifier>{3862B94E-95EA-1542-BE0D-626E18D37DAC}</UniqueIdentifier>
+			<UniqueIdentifier>{0AD7BCB7-3426-C445-B25F-16F29BC6FB1E}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portmidi\pm_common">
-			<UniqueIdentifier>{0EC89154-F78B-574A-9F98-DA57334ABC37}</UniqueIdentifier>
+			<UniqueIdentifier>{F697D9F4-6460-0849-9ED1-20B2E49FB931}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\portmidi\pm_win">
-			<UniqueIdentifier>{F3C17592-21C8-AE42-A181-E7020BA3EFC0}</UniqueIdentifier>
+			<UniqueIdentifier>{BC926FA0-F038-3D4A-A1C7-1C7D19316375}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/smbPitchShift.vcproj
===================================================================
--- trunk/OpenMPT/build/smbPitchShift.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/smbPitchShift.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -352,7 +352,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\smbPitchShift.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -428,7 +428,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\smbPitchShift.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

Modified: trunk/OpenMPT/build/smbPitchShift.vcxproj
===================================================================
--- trunk/OpenMPT/build/smbPitchShift.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/smbPitchShift.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -225,7 +225,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -235,10 +235,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)smbPitchShift.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -253,7 +252,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -263,10 +262,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)smbPitchShift.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/smbPitchShift.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/smbPitchShift.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/smbPitchShift.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{A75DACD9-D1B6-884F-A4DB-9FAF4F94EFF3}</UniqueIdentifier>
+			<UniqueIdentifier>{7C835FEF-2C29-4D40-8EE0-6912B30FCCC3}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\smbPitchShift">
-			<UniqueIdentifier>{34F0855B-629A-9142-A884-7083C1047697}</UniqueIdentifier>
+			<UniqueIdentifier>{2E981FC7-F06B-AF41-A057-6FAE1606AFC0}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/soundtouch.vcproj
===================================================================
--- trunk/OpenMPT/build/soundtouch.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/soundtouch.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -384,7 +384,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,8 +401,7 @@
 				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -469,7 +468,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -486,8 +485,7 @@
 				OutputFile="$(OutDir)\OpenMPT_SoundTouch_i16.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\OpenMPT_SoundTouch_i16.pdb"
+				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/OpenMPT/build/soundtouch.vcxproj
===================================================================
--- trunk/OpenMPT/build/soundtouch.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/soundtouch.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -241,7 +241,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -250,10 +250,9 @@
 			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
 			<ImportLibrary>..\bin\Win32\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
 			<TargetMachine>MachineX86</TargetMachine>
 		</Link>
@@ -270,7 +269,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 		</ClCompile>
 		<ResourceCompile>
 			<PreprocessorDefinitions>DLL_EXPORTS;SOUNDTOUCH_INTEGER_SAMPLES=1;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -279,10 +278,9 @@
 			<OutputFile>$(OutDir)OpenMPT_SoundTouch_i16.dll</OutputFile>
 			<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)OpenMPT_SoundTouch_i16.pdb</ProgramDataBaseFileName>
 			<ImportLibrary>..\bin\x64\OpenMPT_SoundTouch_i16.lib</ImportLibrary>
 			<TargetMachine>MachineX64</TargetMachine>
 		</Link>

Modified: trunk/OpenMPT/build/soundtouch.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/soundtouch.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/soundtouch.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{C86BDA7D-138A-4844-BC6A-5158246C049C}</UniqueIdentifier>
+			<UniqueIdentifier>{029FCCE7-7ED3-9A48-94DA-E68EE97D080E}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\soundtouch">
-			<UniqueIdentifier>{5E973CAA-062C-9F46-9E1D-547DE46D6A68}</UniqueIdentifier>
+			<UniqueIdentifier>{76AA8244-FE2B-6345-9076-C1618A06ED3F}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/zlib.vcproj
===================================================================
--- trunk/OpenMPT/build/zlib.vcproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/zlib.vcproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -365,7 +365,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\zlib.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -444,7 +444,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				ProgramDataBaseFileName="$(OutDir)\zlib.pdb"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool

Modified: trunk/OpenMPT/build/zlib.vcxproj
===================================================================
--- trunk/OpenMPT/build/zlib.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/zlib.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -238,7 +238,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -250,10 +250,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)zlib.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -269,7 +268,7 @@
 			<PrecompiledHeader></PrecompiledHeader>
 			<WarningLevel>Level3</WarningLevel>
 			<FloatingPointModel>Fast</FloatingPointModel>
-			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<DebugInformationFormat></DebugInformationFormat>
 			<CompileAs>CompileAsC</CompileAs>
 		</ClCompile>
 		<ResourceCompile>
@@ -281,10 +280,9 @@
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<GenerateDebugInformation>false</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)zlib.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/build/zlib.vcxproj.filters
===================================================================
--- trunk/OpenMPT/build/zlib.vcxproj.filters	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/build/zlib.vcxproj.filters	2013-11-06 17:05:42 UTC (rev 3102)
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="include">
-			<UniqueIdentifier>{03311BD6-ECC2-D946-8069-8756F632AFAD}</UniqueIdentifier>
+			<UniqueIdentifier>{BE54134D-FF2C-5046-9105-407487BD1D22}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="include\zlib">
-			<UniqueIdentifier>{EF032031-D569-954F-89A3-685063F250C1}</UniqueIdentifier>
+			<UniqueIdentifier>{CD49036E-5713-3445-9AC9-2B28DE4FE443}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>

Modified: trunk/OpenMPT/include/premake4-defaults-DLL.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-DLL.lua	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/include/premake4-defaults-DLL.lua	2013-11-06 17:05:42 UTC (rev 3102)
@@ -34,5 +34,5 @@
   configuration "ReleaseNoLTCG"
    defines { "NDEBUG" }
    defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-   flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
+   flags { "Optimize", "FloatFast", "StaticRuntime" }
    buildoptions { "/GL- /MP" }

Modified: trunk/OpenMPT/include/premake4-defaults.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults.lua	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/include/premake4-defaults.lua	2013-11-06 17:05:42 UTC (rev 3102)
@@ -34,5 +34,5 @@
   configuration "ReleaseNoLTCG"
    defines { "NDEBUG" }
    defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-   flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
+   flags { "Optimize", "FloatFast", "StaticRuntime" }
    buildoptions { "/GL- /MP" }

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-06 16:49:01 UTC (rev 3101)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-06 17:05:42 UTC (rev 3102)
@@ -346,12 +346,13 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>Async</ExceptionHandling>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -364,7 +365,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>OpenMPT_SoundTouch_i16.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -373,6 +373,7 @@
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -400,7 +401,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>Async</ExceptionHandling>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -418,7 +420,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>OpenMPT_SoundTouch_i16.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3104
          http://sourceforge.net/p/modplug/code/3104
Author:   manxorist
Date:     2013-11-06 18:28:24 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Fix] Generate svn_version.h seperately for mptrack and libopenmpt. This avoids triggering rebuild of one project by building the other.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters

Added Paths:
-----------
    trunk/OpenMPT/libopenmpt/svn_version/
    trunk/OpenMPT/mptrack/svn_version/

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-06 18:28:24 UTC (rev 3104)
@@ -158,7 +158,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -168,7 +168,7 @@
       </DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>
@@ -179,7 +179,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -189,7 +189,7 @@
       </DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>
@@ -200,7 +200,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -208,7 +208,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -218,7 +218,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
@@ -226,7 +226,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -241,7 +241,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -256,7 +256,7 @@
       </DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>copy /y bin\libopenmpt.dll bin\in_openmpt.dll
@@ -274,7 +274,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -290,7 +290,7 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -303,7 +303,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -318,7 +318,7 @@
       </DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>copy /y bin\libopenmpt64.dll bin\libmodplug64.dll
@@ -334,7 +334,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -350,7 +350,7 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -363,7 +363,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -375,7 +375,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
@@ -390,7 +390,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;../common;../common/svn_version_subwcrev;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -402,7 +402,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\libopenmpt\svn_version\svn_version.h || del ..\libopenmpt\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>

Index: trunk/OpenMPT/libopenmpt/svn_version
===================================================================
--- trunk/OpenMPT/libopenmpt/svn_version	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/libopenmpt/svn_version	2013-11-06 18:28:24 UTC (rev 3104)

Property changes on: trunk/OpenMPT/libopenmpt/svn_version
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj	2013-11-06 18:28:24 UTC (rev 3104)
@@ -27,7 +27,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true"
+				CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default"
+				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
 				PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -127,7 +127,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true"
+				CommandLine="subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -150,7 +150,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default"
+				AdditionalIncludeDirectories="..\common;..\soundlib;..\include\msinttypes\stdint;..\include\msinttypes\inttypes;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default"
 				PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,MODPLUG_TRACKER"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -1209,7 +1209,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\svn_version_subwcrev\svn_version.template.h"
+				RelativePath="..\mptrack\svn_version\svn_version.template.h"
 				>
 			</File>
 			<File

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-06 18:28:24 UTC (rev 3104)
@@ -124,7 +124,7 @@
     <ClCompile>
       <AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -162,7 +162,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -174,7 +174,7 @@
     <ClCompile>
       <AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -212,7 +212,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -225,7 +225,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -268,7 +268,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -280,7 +280,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -323,7 +323,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">
@@ -336,7 +336,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -379,7 +379,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">
@@ -391,7 +391,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\common\svn_version_subwcrev;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\msinttypes\inttypes;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\include\lhasa\lib\public;..\include\zlib;..\;..\mptrack\svn_version;..\common\svn_version_default;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -434,7 +434,7 @@
       <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
+      <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\mptrack\svn_version\svn_version.h || del ..\mptrack\svn_version\svn_version.h || true</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -628,7 +628,6 @@
     <ClInclude Include="..\common\serialization_utils.h" />
     <ClInclude Include="..\common\StringFixer.h" />
     <ClInclude Include="..\common\svn_version_default\svn_version.h" />
-    <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h" />
     <ClInclude Include="..\common\typedefs.h" />
     <ClInclude Include="..\common\version.h" />
     <ClInclude Include="..\common\versionNumber.h" />
@@ -750,6 +749,7 @@
     <ClInclude Include="StreamEncoderOpus.h" />
     <ClInclude Include="StreamEncoderVorbis.h" />
     <ClInclude Include="StreamEncoderWAV.h" />
+    <ClInclude Include="svn_version\svn_version.h" />
     <ClInclude Include="TrackerSettings.h" />
     <ClInclude Include="TuningDialog.h" />
     <ClInclude Include="tuningRatioMapWnd.h" />

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2013-11-06 18:28:24 UTC (rev 3104)
@@ -879,9 +879,6 @@
     <ClInclude Include="..\soundlib\S3MTools.h">
       <Filter>Source Files\soundlib\Module Loaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\svn_version_subwcrev\svn_version.template.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\soundlib\Dither.h">
       <Filter>Header Files\soundlib</Filter>
     </ClInclude>
@@ -936,6 +933,9 @@
     <ClInclude Include="Settings.h">
       <Filter>Header Files\mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="svn_version\svn_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\bitmap1.bmp">

Index: trunk/OpenMPT/mptrack/svn_version
===================================================================
--- trunk/OpenMPT/mptrack/svn_version	2013-11-06 17:58:13 UTC (rev 3103)
+++ trunk/OpenMPT/mptrack/svn_version	2013-11-06 18:28:24 UTC (rev 3104)

Property changes on: trunk/OpenMPT/mptrack/svn_version
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Added: tsvn:logminsize
## -0,0 +1 ##
+10
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3106
          http://sourceforge.net/p/modplug/code/3106
Author:   manxorist
Date:     2013-11-06 19:04:12 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Int] Move premake defaults to build/.
[Int] Move premake script to build/ and make it callable from either /build/ or / .
[Int] Expect premake4.exe in build/ instead of in include/ .
[Ref] Tiny include/premake4.lua cleanup.

Modified Paths:
--------------
    trunk/OpenMPT/include/premake4.lua

Added Paths:
-----------
    trunk/OpenMPT/build/premake4-defaults-DLL.lua
    trunk/OpenMPT/build/premake4-defaults-EXE.lua
    trunk/OpenMPT/build/premake4-defaults-LIB.lua
    trunk/OpenMPT/build/premake4-defaults.lua
    trunk/OpenMPT/build/update_premake4_projects.cmd

Removed Paths:
-------------
    trunk/OpenMPT/include/premake4-defaults-DLL.lua
    trunk/OpenMPT/include/premake4-defaults-EXE.lua
    trunk/OpenMPT/include/premake4-defaults-LIB.lua
    trunk/OpenMPT/include/premake4-defaults.lua
    trunk/OpenMPT/include/update_premake4_projects.cmd

Property Changed:
----------------
    trunk/OpenMPT/build/

Index: trunk/OpenMPT/build
===================================================================
--- trunk/OpenMPT/build	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/build	2013-11-06 19:04:12 UTC (rev 3106)

Property changes on: trunk/OpenMPT/build
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
 lib
 obj
+premake4.exe
Copied: trunk/OpenMPT/build/premake4-defaults-DLL.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-DLL.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-DLL.lua	                        (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-DLL.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+  configuration { "Debug", "x32" }
+   targetdir "../bin/Win32-Debug"
+  
+  configuration { "Release", "x32" }
+   targetdir "../bin/Win32"
+  
+  configuration { "ReleaseNoLTCG", "x32" }
+   targetdir "../bin/Win32"
+  
+  configuration { "Debug", "x64" }
+   targetdir "../bin/x64-Debug"
+  
+  configuration { "Release", "x64" }
+   targetdir "../bin/x64"
+  
+  configuration { "ReleaseNoLTCG", "x64" }
+   targetdir "../bin/x64"
+  
+  configuration "*"
+   kind "SharedLib"
+
+  dofile "premake4-defaults.lua"

Copied: trunk/OpenMPT/build/premake4-defaults-EXE.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-EXE.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-EXE.lua	                        (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-EXE.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+  configuration { "Debug", "x32" }
+   targetdir "../bin/Win32-Debug"
+  
+  configuration { "Release", "x32" }
+   targetdir "../bin/Win32"
+  
+  configuration { "ReleaseNoLTCG", "x32" }
+   targetdir "../bin/Win32"
+  
+  configuration { "Debug", "x64" }
+   targetdir "../bin/x64-Debug"
+  
+  configuration { "Release", "x64" }
+   targetdir "../bin/x64"
+  
+  configuration { "ReleaseNoLTCG", "x64" }
+   targetdir "../bin/x64"
+  
+  configuration "*"
+   kind "ConsoleApp"
+
+  dofile "premake4-defaults.lua"

Copied: trunk/OpenMPT/build/premake4-defaults-LIB.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults-LIB.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults-LIB.lua	                        (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults-LIB.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,23 @@
+
+  configuration { "Debug", "x32" }
+   targetdir "../build/lib/x32/Debug"
+  
+  configuration { "Release", "x32" }
+   targetdir "../build/lib/x32/Release"
+  
+  configuration { "ReleaseNoLTCG", "x32" }
+   targetdir "../build/lib/x32/ReleaseNoLTCG"
+  
+  configuration { "Debug", "x64" }
+   targetdir "../build/lib/x64/Debug"
+  
+  configuration { "Release", "x64" }
+   targetdir "../build/lib/x64/Release"
+  
+  configuration { "ReleaseNoLTCG", "x64" }
+   targetdir "../build/lib/x64/ReleaseNoLTCG"
+  
+  configuration "*"
+   kind "StaticLib"
+   
+  dofile "premake4-defaults.lua"

Copied: trunk/OpenMPT/build/premake4-defaults.lua (from rev 3105, trunk/OpenMPT/include/premake4-defaults.lua)
===================================================================
--- trunk/OpenMPT/build/premake4-defaults.lua	                        (rev 0)
+++ trunk/OpenMPT/build/premake4-defaults.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,17 @@
+
+  configuration "Debug"
+   defines { "DEBUG" }
+   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+   flags { "Symbols" }
+  
+  configuration "Release"
+   defines { "NDEBUG" }
+   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+   flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
+   buildoptions { "/MP" }
+
+  configuration "ReleaseNoLTCG"
+   defines { "NDEBUG" }
+   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
+   flags { "Optimize", "FloatFast", "StaticRuntime" }
+   buildoptions { "/GL- /MP" }

Copied: trunk/OpenMPT/build/update_premake4_projects.cmd (from rev 3104, trunk/OpenMPT/include/update_premake4_projects.cmd)
===================================================================
--- trunk/OpenMPT/build/update_premake4_projects.cmd	                        (rev 0)
+++ trunk/OpenMPT/build/update_premake4_projects.cmd	2013-11-06 19:04:12 UTC (rev 3106)
@@ -0,0 +1,25 @@
+@echo off
+
+set MY_DIR=%CD%
+
+cd build
+cd .. || goto err
+
+echo dofile "include/premake4.lua" > premake4.lua || goto err
+
+build\premake4.exe vs2010 || goto err
+build\premake4.exe vs2008 || goto err
+
+del premake4.lua || goto err
+
+cd %MY_DIR% || goto err
+
+goto end
+
+:err
+echo ERROR!
+goto end
+
+:end
+cd %MY_DIR%
+pause

Deleted: trunk/OpenMPT/include/premake4-defaults-DLL.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-DLL.lua	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-DLL.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
-  configuration { "Debug", "x32" }
-   targetdir "../bin/Win32-Debug"
-  
-  configuration { "Release", "x32" }
-   targetdir "../bin/Win32"
-  
-  configuration { "ReleaseNoLTCG", "x32" }
-   targetdir "../bin/Win32"
-  
-  configuration { "Debug", "x64" }
-   targetdir "../bin/x64-Debug"
-  
-  configuration { "Release", "x64" }
-   targetdir "../bin/x64"
-  
-  configuration { "ReleaseNoLTCG", "x64" }
-   targetdir "../bin/x64"
-  
-  configuration "*"
-   kind "SharedLib"
-
-  dofile "premake4-defaults.lua"

Deleted: trunk/OpenMPT/include/premake4-defaults-EXE.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-EXE.lua	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-EXE.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
-  configuration { "Debug", "x32" }
-   targetdir "../bin/Win32-Debug"
-  
-  configuration { "Release", "x32" }
-   targetdir "../bin/Win32"
-  
-  configuration { "ReleaseNoLTCG", "x32" }
-   targetdir "../bin/Win32"
-  
-  configuration { "Debug", "x64" }
-   targetdir "../bin/x64-Debug"
-  
-  configuration { "Release", "x64" }
-   targetdir "../bin/x64"
-  
-  configuration { "ReleaseNoLTCG", "x64" }
-   targetdir "../bin/x64"
-  
-  configuration "*"
-   kind "ConsoleApp"
-
-  dofile "premake4-defaults.lua"

Deleted: trunk/OpenMPT/include/premake4-defaults-LIB.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults-LIB.lua	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults-LIB.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,23 +0,0 @@
-
-  configuration { "Debug", "x32" }
-   targetdir "../build/lib/x32/Debug"
-  
-  configuration { "Release", "x32" }
-   targetdir "../build/lib/x32/Release"
-  
-  configuration { "ReleaseNoLTCG", "x32" }
-   targetdir "../build/lib/x32/ReleaseNoLTCG"
-  
-  configuration { "Debug", "x64" }
-   targetdir "../build/lib/x64/Debug"
-  
-  configuration { "Release", "x64" }
-   targetdir "../build/lib/x64/Release"
-  
-  configuration { "ReleaseNoLTCG", "x64" }
-   targetdir "../build/lib/x64/ReleaseNoLTCG"
-  
-  configuration "*"
-   kind "StaticLib"
-   
-  dofile "premake4-defaults.lua"

Deleted: trunk/OpenMPT/include/premake4-defaults.lua
===================================================================
--- trunk/OpenMPT/include/premake4-defaults.lua	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4-defaults.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,17 +0,0 @@
-
-  configuration "Debug"
-   defines { "DEBUG" }
-   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-   flags { "Symbols" }
-  
-  configuration "Release"
-   defines { "NDEBUG" }
-   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-   flags { "Symbols", "Optimize", "FloatFast", "StaticRuntime" }
-   buildoptions { "/MP" }
-
-  configuration "ReleaseNoLTCG"
-   defines { "NDEBUG" }
-   defines { "WIN32", "_CRT_SECURE_NO_WARNINGS", "_CRT_NONSTDC_NO_DEPRECATE", "_CRT_SECURE_NO_DEPRECATE", "_CRT_NONSTDC_NO_WARNINGS" }
-   flags { "Optimize", "FloatFast", "StaticRuntime" }
-   buildoptions { "/GL- /MP" }

Modified: trunk/OpenMPT/include/premake4.lua
===================================================================
--- trunk/OpenMPT/include/premake4.lua	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/premake4.lua	2013-11-06 19:04:12 UTC (rev 3106)
@@ -129,7 +129,7 @@
    "../include/unrar/version.hpp",
    "../include/unrar/volume.hpp",
   }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
   
   
   
@@ -169,7 +169,7 @@
    "../include/zlib/zlib.h",
    "../include/zlib/zutil.h",
   }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
   
   
   
@@ -194,7 +194,7 @@
    "../include/zlib/contrib/minizip/unzip.h",
    "../include/zlib/contrib/minizip/zip.h",
   }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
    
    
    
@@ -206,7 +206,7 @@
   files {
    "../include/miniz/miniz.c",
   }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
 
 
 
@@ -222,7 +222,7 @@
   files {
    "../include/smbPitchShift/smbPitchShift.h",
   }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
 
   
   
@@ -272,7 +272,7 @@
   }
   configuration "vs2008"
    includedirs { "../include/msinttypes/stdint" }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
 
 
     
@@ -339,7 +339,7 @@
    defines { "VERSION=\"1.2.1\"" }
   configuration "vs2008"
    defines { "VERSION=\\\"1.2.1\\\"" }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
 
   
   
@@ -411,7 +411,7 @@
   buildoptions { "/wd4018", "/wd4267" }
   configuration "Debug*"
    defines { "PA_ENABLE_DEBUG_OUTPUT" }
-  dofile "premake4-defaults-LIB.lua"
+  dofile "../build/premake4-defaults-LIB.lua"
   
 
   
@@ -436,18 +436,10 @@
    "../include/portmidi/pm_common/portmidi.h",
    "../include/portmidi/pm_win/pmwinmm.h",
   }
-  dofile "premake4-defaults-LIB.lua"
-  
+  dofile "../build/premake4-defaults-LIB.lua"
 
-
-  
-  
-solution "includeDLL"
- configurations { "Debug", "Release", "ReleaseNoLTCG" }
- platforms { "x32", "x64" }
  
  
- 
  project "soundtouch"
   uuid "F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD"
   language "C++"
@@ -484,7 +476,7 @@
    "../include/soundtouch/TDStretch.h",
   }
   defines { "DLL_EXPORTS", "SOUNDTOUCH_INTEGER_SAMPLES=1" }
-  dofile "premake4-defaults-DLL.lua"
+  dofile "../build/premake4-defaults-DLL.lua"
  
  
  

Deleted: trunk/OpenMPT/include/update_premake4_projects.cmd
===================================================================
--- trunk/OpenMPT/include/update_premake4_projects.cmd	2013-11-06 18:45:16 UTC (rev 3105)
+++ trunk/OpenMPT/include/update_premake4_projects.cmd	2013-11-06 19:04:12 UTC (rev 3106)
@@ -1,2 +0,0 @@
-premake4.exe vs2010
-premake4.exe vs2008

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3109
          http://sourceforge.net/p/modplug/code/3109
Author:   manxorist
Date:     2013-11-06 21:27:32 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
[Ref] libopenmpt: Merge libopenmpt_version.cpp into libopenmpt_impl.cpp and kill it.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
    trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
    trunk/OpenMPT/openmpt123/Makefile

Removed Paths:
-------------
    trunk/OpenMPT/libopenmpt/libopenmpt_version.cpp

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-06 20:41:45 UTC (rev 3108)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-06 21:27:32 UTC (rev 3109)
@@ -578,7 +578,6 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Test|x64'">CompileAsC</CompileAs>
     </ClCompile>
     <ClCompile Include="libopenmpt_test.cpp" />
-    <ClCompile Include="libopenmpt_version.cpp" />
     <ClCompile Include="libopenmpt_winamp.cpp" />
     <ClCompile Include="libopenmpt_xmplay.cpp" />
   </ItemGroup>

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-06 20:41:45 UTC (rev 3108)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-06 21:27:32 UTC (rev 3109)
@@ -478,9 +478,6 @@
     <ClCompile Include="libopenmpt_cxx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="libopenmpt_version.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="libopenmpt_interactive.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-11-06 20:41:45 UTC (rev 3108)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-11-06 21:27:32 UTC (rev 3109)
@@ -17,18 +17,82 @@
 #include <algorithm>
 #include <iostream>
 #include <iterator>
+#include <sstream>
 
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
 
+#include "common/version.h"
 #include "soundlib/Sndfile.h"
 #include "soundlib/AudioReadTarget.h"
 #include "soundlib/FileReader.h"
 
 namespace openmpt {
 
-log_interface::log_interface() {
+namespace version {
+
+std::uint32_t get_library_version() {
+	return OPENMPT_API_VERSION | ( MptVersion::GetRevision() & 0xffff );
+}
+
+std::uint32_t get_core_version() {
+	return MptVersion::num;
+}
+
+static std::string get_library_version_string() {
+	std::ostringstream str;
+	std::uint32_t version = get_library_version();
+	if ( ( version & 0xffff ) == 0 ) {
+		str << ((version>>24) & 0xff) << "." << ((version>>16) & 0xff);
+	} else {
+		str << ((version>>24) & 0xff) << "." << ((version>>16) & 0xff) << "." << ((version>>0) & 0xffff);
+	}
+	if ( MptVersion::IsDirty() ) {
+		str << ".2-modified";
+	} else if ( MptVersion::HasMixedRevisions() ) {
+		str << ".1-modified";
+	}
+	return str.str();
+}
+
+static std::string get_core_version_string() {
+	return MptVersion::GetVersionStringExtended();
+}
+
+static std::string get_build_string() {
+	return MptVersion::GetBuildDateString();
+}
+
+static std::string get_credits_string() {
+	return mpt::String::Convert( MptVersion::GetFullCreditsString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
+}
+
+static std::string get_contact_string() {
+	return mpt::String::Convert( MptVersion::GetContactString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
+}
+
+std::string get_string( const std::string & key ) {
+	if ( key == "" ) {
+		return std::string();
+	} else if ( key == string::library_version ) {
+		return get_library_version_string();
+	} else if ( key == string::core_version ) {
+		return get_core_version_string();
+	} else if ( key == string::build ) {
+		return get_build_string();
+	} else if ( key == string::credits ) {
+		return get_credits_string();
+	} else if ( key == string::contact ) {
+		return get_contact_string();
+	} else {
+		return std::string();
+	}
+}
+
+} // namespace version
+
+ log_interface::log_interface() {
 	return;
 }
 log_interface::~log_interface() {

Deleted: trunk/OpenMPT/libopenmpt/libopenmpt_version.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_version.cpp	2013-11-06 20:41:45 UTC (rev 3108)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_version.cpp	2013-11-06 21:27:32 UTC (rev 3109)
@@ -1,82 +0,0 @@
-/*
- * libopenmpt_version.cpp
- * ----------------------
- * Purpose: libopenmpt versioning helpers
- * Notes  : (currently none)
- * Authors: OpenMPT Devs
- * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
- */
-
-#include "common/stdafx.h"
-
-#include "libopenmpt_internal.h"
-#include "libopenmpt.hpp"
-#include "libopenmpt.h"
-
-#include <sstream>
-
-#include "common/version.h"
-
-#include "svn_version.h"
-
-namespace openmpt { namespace version {
-
-std::uint32_t get_library_version() {
-	return OPENMPT_API_VERSION | ( MptVersion::GetRevision() & 0xffff );
-}
-
-std::uint32_t get_core_version() {
-	return MptVersion::num;
-}
-
-static std::string get_library_version_string() {
-	std::ostringstream str;
-	std::uint32_t version = get_library_version();
-	if ( ( version & 0xffff ) == 0 ) {
-		str << ((version>>24) & 0xff) << "." << ((version>>16) & 0xff);
-	} else {
-		str << ((version>>24) & 0xff) << "." << ((version>>16) & 0xff) << "." << ((version>>0) & 0xffff);
-	}
-	if ( MptVersion::IsDirty() ) {
-		str << ".2-modified";
-	} else if ( MptVersion::HasMixedRevisions() ) {
-		str << ".1-modified";
-	}
-	return str.str();
-}
-
-static std::string get_core_version_string() {
-	return MptVersion::GetVersionStringExtended();
-}
-
-static std::string get_build_string() {
-	return MptVersion::GetBuildDateString();
-}
-
-static std::string get_credits_string() {
-	return mpt::String::Convert( MptVersion::GetFullCreditsString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
-}
-
-static std::string get_contact_string() {
-	return mpt::String::Convert( MptVersion::GetContactString(), mpt::CharsetISO8859_1, mpt::CharsetUTF8 );
-}
-
-std::string get_string( const std::string & key ) {
-	if ( key == "" ) {
-		return std::string();
-	} else if ( key == string::library_version ) {
-		return get_library_version_string();
-	} else if ( key == string::core_version ) {
-		return get_core_version_string();
-	} else if ( key == string::build ) {
-		return get_build_string();
-	} else if ( key == string::credits ) {
-		return get_credits_string();
-	} else if ( key == string::contact ) {
-		return get_contact_string();
-	} else {
-		return std::string();
-	}
-}
-
-} } // namespace openmpt::version

Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-11-06 20:41:45 UTC (rev 3108)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-11-06 21:27:32 UTC (rev 3109)
@@ -213,7 +213,6 @@
  ../libopenmpt/libopenmpt_cxx.cpp \
  ../libopenmpt/libopenmpt_impl.cpp \
  ../libopenmpt/libopenmpt_interactive.cpp \
- ../libopenmpt/libopenmpt_version.cpp \
  
 ifeq ($(NO_ZLIB),1)
 LIBOPENMPT_C_SOURCES += ../include/miniz/miniz.c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3111
          http://sourceforge.net/p/modplug/code/3111
Author:   manxorist
Date:     2013-11-07 15:45:35 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
[Fix] VS2008 gets the character set conversion wrong for std::fstream filenames as char strings. It uses the C locale instead of the windows CP_ACP ansi codepage for conversion. Provide mpt::fstream in common/mptFstream.h wrappers around <fstream> which do the conversion the correct way on VS2008. For other compilers, nothing is changed.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
    trunk/OpenMPT/mptrack/CommandSet.cpp
    trunk/OpenMPT/mptrack/Mod2wave.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Settings.cpp
    trunk/OpenMPT/mptrack/TuningDialog.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/tuningCollection.cpp
    trunk/OpenMPT/test/test.cpp

Added Paths:
-----------
    trunk/OpenMPT/common/mptFstream.h

Added: trunk/OpenMPT/common/mptFstream.h
===================================================================
--- trunk/OpenMPT/common/mptFstream.h	                        (rev 0)
+++ trunk/OpenMPT/common/mptFstream.h	2013-11-07 15:45:35 UTC (rev 3111)
@@ -0,0 +1,167 @@
+/*
+ * mptFstream.h
+ * ------------
+ * Purpose: A wrapper around std::fstream, fixing VS2008 charset conversion braindamage.
+ * Notes  : You should only ever use these wrappers instead of plain std::fstream classes.
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+#pragma once
+
+#include <fstream>
+
+#if MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)
+#include "../common/mptString.h"
+#endif
+
+namespace mpt
+{
+
+#if MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)
+
+// VS2008 converts char filenames with CRT mbcs string conversion functions to wchar_t filenames.
+// This is totally wrong for Win32 GUI applications because the C locale does not necessarily match the current windows ANSI codepage (CP_ACP).
+// Work around this insanity by using our own string conversions for the std::fstream filenames.
+
+class fstream
+	: public std::fstream
+{
+private:
+	void mptopen(const std::wstring & filename, std::ios_base::openmode mode)
+	{
+		std::fstream::open(filename.c_str(), mode);
+	}
+	void mptopen(const std::string & filename, std::ios_base::openmode mode)
+	{
+		mptopen(mpt::String::Decode(filename, mpt::CharsetLocale).c_str(), mode);
+	}
+	void mptopen(const char * filename, std::ios_base::openmode mode)
+	{
+		mptopen(filename ? std::string(filename) : std::string(), mode);
+	}
+public:
+	fstream() {}
+	fstream(const char * filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	fstream(const std::string & filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	fstream(const wchar_t * filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	fstream(const std::wstring & filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const char * filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const std::string & filename, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+};
+
+class ifstream
+	: public std::ifstream
+{
+private:
+	void mptopen(const std::wstring & filename, std::ios_base::openmode mode)
+	{
+		std::ifstream::open(filename.c_str(), mode);
+	}
+	void mptopen(const std::string & filename, std::ios_base::openmode mode)
+	{
+		mptopen(mpt::String::Decode(filename, mpt::CharsetLocale).c_str(), mode);
+	}
+	void mptopen(const char * filename, std::ios_base::openmode mode)
+	{
+		mptopen(filename ? std::string(filename) : std::string(), mode);
+	}
+public:
+	ifstream() {}
+	ifstream(const char * filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+	ifstream(const std::string & filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+	ifstream(const wchar_t * filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+	ifstream(const std::wstring & filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const char * filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const std::string & filename, std::ios_base::openmode mode = std::ios_base::in)
+	{
+		mptopen(filename, mode);
+	}
+};
+
+class ofstream
+	: public std::ofstream
+{
+private:
+	void mptopen(const std::wstring & filename, std::ios_base::openmode mode)
+	{
+		std::ofstream::open(filename.c_str(), mode);
+	}
+	void mptopen(const std::string & filename, std::ios_base::openmode mode)
+	{
+		mptopen(mpt::String::Decode(filename, mpt::CharsetLocale).c_str(), mode);
+	}
+	void mptopen(const char * filename, std::ios_base::openmode mode)
+	{
+		mptopen(filename ? std::string(filename) : std::string(), mode);
+	}
+public:
+	ofstream() {}
+	ofstream(const char * filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	ofstream(const std::string & filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	ofstream(const wchar_t * filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	ofstream(const std::wstring & filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const char * filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+	void open(const std::string & filename, std::ios_base::openmode mode = std::ios_base::out)
+	{
+		mptopen(filename, mode);
+	}
+};
+
+#else
+
+typedef std::fstream fstream;
+typedef std::ifstream ifstream;
+typedef std::ofstream ofstream;
+
+#endif
+
+} // namespace mpt


Property changes on: trunk/OpenMPT/common/mptFstream.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj	2013-11-07 15:45:35 UTC (rev 3111)
@@ -415,6 +415,7 @@
     <ClInclude Include="..\common\FlagSet.h" />
     <ClInclude Include="..\common\Logging.h" />
     <ClInclude Include="..\common\misc_util.h" />
+    <ClInclude Include="..\common\mptFstream.h" />
     <ClInclude Include="..\common\mptString.h" />
     <ClInclude Include="..\common\mutex.h" />
     <ClInclude Include="..\common\Profiler.h" />

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters	2013-11-07 15:45:35 UTC (rev 3111)
@@ -254,6 +254,9 @@
     <ClInclude Include="libopenmpt_stream_callbacks_file.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\mptFstream.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\AudioCriticalSection.cpp">

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -16,7 +16,7 @@
 #include "../mptrack/Reporting.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include <fstream>
+#include "../common/mptFstream.h"
 
 #define ENABLE_LOGGING 0
 
@@ -1678,7 +1678,7 @@
 bool CCommandSet::LoadFile(CString fileName)
 //------------------------------------------
 {
-	std::ifstream fin(fileName);
+	mpt::ifstream fin(fileName);
 	if (fin.fail())
 	{
 		CString strMsg;

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -24,7 +24,7 @@
 #include "../soundlib/Dither.h"
 #include "../soundlib/AudioReadTarget.h"
 
-#include <fstream>
+#include "../common/mptFstream.h"
 
 extern const char *gszChnCfgNames[3];
 
@@ -847,13 +847,13 @@
 	char *tempPath = _tempnam("", "OpenMPT_mod2wave");
 	const std::string normalizeFileName = tempPath;
 	free(tempPath);
-	std::fstream normalizeFile;
+	mpt::fstream normalizeFile;
 	if(m_Settings.Normalize)
 	{
 		normalizeFile.open(normalizeFileName.c_str(), std::ios::binary | std::ios::in | std::ios::out | std::ios::trunc);
 	}
 
-	std::ofstream fileStream(m_lpszFileName, std::ios::binary | std::ios::trunc);
+	mpt::ofstream fileStream(m_lpszFileName, std::ios::binary | std::ios::trunc);
 
 	if(!fileStream)
 	{

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -31,7 +31,7 @@
 #ifdef NO_FILEREADER_STD_ISTREAM
 #include "MemoryMappedFile.h"
 #else
-#include <fstream>
+#include "../common/mptFstream.h"
 #endif
 #include "soundlib/FileReader.h"
 #include <shlwapi.h>
@@ -218,7 +218,7 @@
 
 	BeginWaitCursor();
 	#ifndef NO_FILEREADER_STD_ISTREAM
-		std::ifstream f(lpszPathName, std::ios_base::binary);
+		mpt::ifstream f(lpszPathName, std::ios_base::binary);
 		m_SndFile.Create(FileReader(&f), CSoundFile::loadCompleteModule, this);
 	#else
 	{

Modified: trunk/OpenMPT/mptrack/Settings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Settings.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/Settings.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -20,7 +20,7 @@
 #include <shlwapi.h>
 
 #include <algorithm>
-#include <fstream>
+#include "../common/mptFstream.h"
 #include <iterator>
 
 
@@ -434,7 +434,7 @@
 
 static std::vector<char> ReadFile(const mpt::PathString &filename)
 {
-	std::ifstream s(filename.c_str(), std::ios::binary);
+	mpt::ifstream s(filename.c_str(), std::ios::binary);
 	std::vector<char> result;
 	while(s)
 	{
@@ -449,7 +449,7 @@
 static void WriteFileUTF16LE(const mpt::PathString &filename, const std::wstring &str)
 {
 	STATIC_ASSERT(sizeof(wchar_t) == 2);
-	std::ofstream inifile(filename.c_str(), std::ios::binary | std::ios::trunc);
+	mpt::ofstream inifile(filename.c_str(), std::ios::binary | std::ios::trunc);
 	const uint8 UTF16LE_BOM[] = { 0xff, 0xfe };
 	inifile.write(reinterpret_cast<const char*>(UTF16LE_BOM), 2);
 	inifile.write(reinterpret_cast<const char*>(str.c_str()), str.length() * sizeof(std::wstring::value_type));

Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -13,7 +13,7 @@
 #include "TuningDialog.h"
 #include "TrackerSettings.h"
 #include <algorithm>
-#include <fstream>
+#include "../common/mptFstream.h"
 #include "../common/misc_util.h"
 #include "tuningdialog.h"
 
@@ -639,7 +639,7 @@
 
 	bool failure = true;
 	
-	std::ofstream fout(files.first_file.c_str(), std::ios::binary);
+	mpt::ofstream fout(files.first_file.c_str(), std::ios::binary);
 	const std::string ext = "." + files.extension;
 
 	if(ext == CTuning::s_FileExtension)
@@ -699,7 +699,7 @@
 
 			if (bIsTun)
 			{
-				std::ifstream fin(files.filenames[counter].c_str(), std::ios::binary);
+				mpt::ifstream fin(files.filenames[counter].c_str(), std::ios::binary);
 				pT = CTuningRTI::DeserializeOLD(fin);
 				if(pT == 0)
 					{fin.clear(); fin.seekg(0); pT = CTuningRTI::Deserialize(fin);}

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -28,7 +28,7 @@
 #include "MemoryMappedFile.h"
 #include "../soundlib/FileReader.h"
 #include "../soundlib/plugins/JBridge.h"
-#include <fstream>
+#include "../common/mptFstream.h"
 #ifdef VST_USE_ALTERNATIVE_MAGIC	//Pelya's plugin ID fix. Breaks fx presets, so let's avoid it for now.
 #include "../zlib/zlib.h"			//For CRC32 calculation (to detect plugins with same UID)
 #endif // VST_USE_ALTERNATIVE_MAGIC
@@ -1622,8 +1622,7 @@
 
 	bool bank = !mpt::strnicmp(files.first_file.substr(files.first_file.length() - 3).c_str(), "fxb", 3);
 
-	std::fstream f;
-	f.open(files.first_file.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+	mpt::fstream f(files.first_file.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
 	if(f.good() && VSTPresets::SaveFile(f, *this, bank))
 	{
 		return true;

Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj	2013-11-07 15:45:35 UTC (rev 3111)
@@ -1041,6 +1041,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\mptFstream.h"
+				>
+			</File>
+			<File
 				RelativePath=".\mptrack.h"
 				>
 			</File>

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj	2013-11-07 15:45:35 UTC (rev 3111)
@@ -622,6 +622,7 @@
     <ClInclude Include="..\common\FlagSet.h" />
     <ClInclude Include="..\common\Logging.h" />
     <ClInclude Include="..\common\misc_util.h" />
+    <ClInclude Include="..\common\mptFstream.h" />
     <ClInclude Include="..\common\mptString.h" />
     <ClInclude Include="..\common\mutex.h" />
     <ClInclude Include="..\common\Profiler.h" />

Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters	2013-11-07 15:45:35 UTC (rev 3111)
@@ -936,6 +936,9 @@
     <ClInclude Include="svn_version\svn_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\mptFstream.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\bitmap1.bmp">

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -16,7 +16,7 @@
 #include "../mptrack/moddoc.h"
 #endif
 #include "../common/serialization_utils.h"
-#include <fstream>
+#include "../common/mptFstream.h"
 #include <sstream>
 #include <list>
 #include "../common/version.h"
@@ -1624,7 +1624,7 @@
 	// Using std::ios::in | std::ios::out | std::ios::ate prevents truncation and sets the file pointer to the end of the so-far saved file,
 	//  but it also allows reading, which does no harm but is not what we actually really want here.
 	// That's a very broken interface.
-	std::ofstream fout(lpszFileName, std::ios::binary | std::ios::ate | std::ios::in);
+	mpt::ofstream fout(lpszFileName, std::ios::binary | std::ios::ate | std::ios::in);
 #endif
 
 	const uint32 MPTStartPos = (uint32)fout.tellp();

Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -13,7 +13,7 @@
 #include "../common/serialization_utils.h"
 #include <algorithm>
 #include <bitset>
-#include <fstream>
+#include "../common/mptFstream.h"
 
 /*
 Version history:
@@ -124,7 +124,7 @@
 {
 	if(m_SavefilePath.length() < 1)
 		return SERIALIZATION_FAILURE;
-	std::ofstream fout(m_SavefilePath.c_str(), std::ios::binary);
+	mpt::ofstream fout(m_SavefilePath.c_str(), std::ios::binary);
 	if(!fout.good())
 		return SERIALIZATION_FAILURE;
 
@@ -139,7 +139,7 @@
 {
 	if(m_SavefilePath.length() < 1)
 		return SERIALIZATION_FAILURE;
-	std::ifstream fin(m_SavefilePath.c_str(), std::ios::binary);
+	mpt::ifstream fin(m_SavefilePath.c_str(), std::ios::binary);
 	if(!fin.good())
 		return SERIALIZATION_FAILURE;
 

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-11-07 15:39:20 UTC (rev 3110)
+++ trunk/OpenMPT/test/test.cpp	2013-11-07 15:45:35 UTC (rev 3111)
@@ -32,7 +32,7 @@
 #include "../mptrack/Settings.h"
 #endif // MODPLUG_TRACKER
 #ifndef MODPLUG_TRACKER
-#include <fstream>
+#include "../common/mptFstream.h"
 #endif // !MODPLUG_TRACKER
 #include <limits>
 #ifndef MODPLUG_TRACKER
@@ -1424,7 +1424,7 @@
 
 static TSoundFileContainer CreateSoundFileContainer(const std::string &filename)
 {
-	std::ifstream stream(filename, std::ios::binary);
+	mpt::ifstream stream(filename, std::ios::binary);
 	FileReader file(&stream);
 	std::shared_ptr<CSoundFile> pSndFile(new CSoundFile());
 	pSndFile->Create(file, CSoundFile::loadCompleteModule);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3113
          http://sourceforge.net/p/modplug/code/3113
Author:   manxorist
Date:     2013-11-07 19:19:11 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
[Ref] Make PathString an explicit type instead of a typedef. This allows for stricter type checking.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Settings.cpp

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-07 16:00:36 UTC (rev 3112)
+++ trunk/OpenMPT/common/mptString.h	2013-11-07 19:19:11 UTC (rev 3113)
@@ -160,24 +160,123 @@
 } // namespace String
 
 
+
 #if defined(WIN32)
-typedef std::wstring PathString;
-#define MPT_PATHSTRING(lit) L##lit
-static inline std::string PathToLocale(const PathString &path) { return mpt::String::Encode(path, mpt::CharsetLocale); }
-static inline std::string PathToUTF8(const PathString &path)   { return mpt::String::Encode(path, mpt::CharsetUTF8);   }
-static inline std::wstring PathToWide(const PathString &path)  { return path; }
-static inline PathString LocaleToPath(const std::string &path) { return mpt::String::Decode(path, mpt::CharsetLocale); }
-static inline PathString UTF8ToPath(const std::string &path)   { return mpt::String::Decode(path, mpt::CharsetUTF8);   }
-static inline PathString WideToPath(const std::wstring &path)  { return path; }
+
+typedef std::wstring RawPathString;
+
+class PathString
+{
+private:
+	RawPathString path;
+private:
+	PathString(const RawPathString & path)
+		: path(path)
+	{
+		return;
+	}
+public:
+	PathString()
+	{
+		return;
+	}
+	PathString(const PathString & other)
+		: path(other.path)
+	{
+		return;
+	}
+	PathString & assign(const PathString & other)
+	{
+		path = other.path;
+		return *this;
+	}
+	PathString & operator = (const PathString & other)
+	{
+		return assign(other);
+	}
+	PathString & append(const PathString & other)
+	{
+		path.append(other.path);
+		return *this;
+	}
+	PathString & operator += (const PathString & other)
+	{
+		return append(other);
+	}
+	friend PathString operator + (const PathString & a, const PathString & b)
+	{
+		return PathString(a).append(b);
+	}
+public:
+	// conversions
+	std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
+	std::string ToUTF8() const { return mpt::String::Encode(path, mpt::CharsetUTF8); }
+	std::wstring ToWide() const { return path; }
+	static PathString FromLocale(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetLocale)); }
+	static PathString FromUTF8(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetUTF8)); }
+	static PathString FromWide(const std::wstring &path) { return PathString(path); }
+	RawPathString AsNative() const { return path; }
+	static PathString FromNative(const RawPathString &path) { return PathString(path); }
+};
+
 #else // !WIN32
-typedef std::string PathString;
-#define MPT_PATHSTRING(lit) lit
-static inline std::string PathToLocale(const PathString &path) { return path; }
-static inline std::string PathToUTF8(const PathString &path)   { return mpt::String::Convert(path, mpt::CharsetLocale, mpt::CharsetUTF8); }
-static inline std::wstring PathToWide(const PathString &path)  { return mpt::String::Decode(path, mpt::CharsetLocale); }
-static inline PathString LocaleToPath(const std::string &path) { return path; }
-static inline PathString UTF8ToPath(const std::string &path)   { return mpt::String::Convert(path, mpt::CharsetUTF8, mpt::CharsetLocale); }
-static inline PathString WideToPath(const std::wstring &path)  { return mpt::String::Encode(path, mpt::CharsetLocale); }
+
+typedef std::string RawPathString;
+
+class PathString
+{
+private:
+	RawPathString path;
+private:
+	PathString(const RawPathString & path)
+		: path(path)
+	{
+		return;
+	}
+public:
+	PathString()
+	{
+		return;
+	}
+	PathString(const PathString & other)
+		: path(other.path)
+	{
+		return;
+	}
+	PathString & assign(const PathString & other)
+	{
+		path = other.path;
+		return *this;
+	}
+	PathString & operator = (const PathString & other)
+	{
+		return assign(other);
+	}
+	PathString & append(const PathString & other)
+	{
+		path.append(other.path);
+		return *this;
+	}
+	PathString & operator += (const PathString & other)
+	{
+		return append(other);
+	}
+	friend PathString operator + (const PathString & a, const PathString & b)
+	{
+		return PathString(a).append(b);
+	}
+public:
+	// conversions
+	std::string ToLocale() const { return path; }
+	std::string ToUTF8() const { return mpt::String::Convert(path, mpt::CharsetLocale, mpt::CharsetUTF8); }
+	std::wstring ToWide() const { return mpt::String::Decode(path, mpt::CharsetLocale); }
+	static PathString FromLocale(const std::string &path) { return PathString(path); }
+	static PathString FromUTF8(const std::string &path) { return PathString(mpt::String::Convert(path, mpt::CharsetUTF8, mpt::CharsetLocale)); }
+	static PathString FromWide(const std::wstring &path) { return PathString(mpt::String::Encode(path, mpt::CharsetLocale)); }
+	RawPathString AsNative() const { return path; }
+	static PathString FromNative(const RawPathString &path) { return PathString(path); }
+};
+
 #endif // WIN32
 
 

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-07 16:00:36 UTC (rev 3112)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-07 19:19:11 UTC (rev 3113)
@@ -495,7 +495,7 @@
 	// Ensure that all colours are reset (for outdated colour schemes)
 	OnPresetMPT();
 	{
-		IniFileSettingsContainer file(mpt::LocaleToPath(files.first_file));
+		IniFileSettingsContainer file(mpt::PathString::FromLocale(files.first_file));
 		for(int i = 0; i < MAX_MODCOLORS; i++)
 		{
 			TCHAR sKeyName[16];
@@ -515,7 +515,7 @@
 	if(files.abort)
 		return;
 	{
-		IniFileSettingsContainer file(mpt::LocaleToPath(files.first_file));
+		IniFileSettingsContainer file(mpt::PathString::FromLocale(files.first_file));
 		for(int i = 0; i < MAX_MODCOLORS; i++)
 		{
 			TCHAR sKeyName[16];

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-07 16:00:36 UTC (rev 3112)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-07 19:19:11 UTC (rev 3113)
@@ -350,7 +350,7 @@
 		return TRUE;
 	}
 
-	IniFileSettingsContainer file(mpt::LocaleToPath(lpszConfigFile));
+	IniFileSettingsContainer file(mpt::PathString::FromLocale(lpszConfigFile));
 	return ImportMidiConfig(file);
 }
 
@@ -417,7 +417,7 @@
 //-----------------------------------------------------
 {
 	if ((!glpMidiLibrary) || (!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
-	IniFileSettingsContainer file(mpt::LocaleToPath(lpszConfigFile));
+	IniFileSettingsContainer file(mpt::PathString::FromLocale(lpszConfigFile));
 	return ExportMidiConfig(file);
 }
 
@@ -839,13 +839,13 @@
 	// Construct auto saver instance, class TrackerSettings expects it being available.
 	CMainFrame::m_pAutoSaver = new CAutoSaver();
 
-	m_pSettingsIniFile = new IniFileSettingsBackend(mpt::LocaleToPath(m_szConfigFileName));
+	m_pSettingsIniFile = new IniFileSettingsBackend(mpt::PathString::FromLocale(m_szConfigFileName));
 	
 	m_pSettings = new SettingsContainer(m_pSettingsIniFile);
 
 	m_pTrackerSettings = new TrackerSettings(*m_pSettings);
 
-	m_pPluginCache = new IniFileSettingsContainer(mpt::LocaleToPath(m_szPluginCacheFileName));
+	m_pPluginCache = new IniFileSettingsContainer(mpt::PathString::FromLocale(m_szPluginCacheFileName));
 
 	int mruListLength = GetSettings().Read<int32>("Misc", "MRUListLength", 10);
 	Limit(mruListLength, 0, 15);

Modified: trunk/OpenMPT/mptrack/Settings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Settings.cpp	2013-11-07 16:00:36 UTC (rev 3112)
+++ trunk/OpenMPT/mptrack/Settings.cpp	2013-11-07 19:19:11 UTC (rev 3113)
@@ -331,14 +331,14 @@
 std::vector<char> IniFileSettingsBackend::ReadSettingRaw(const SettingPath &path, const std::vector<char> &def) const
 {
 	std::vector<char> result = def;
-	::GetPrivateProfileStructW(GetSection(path).c_str(), GetKey(path).c_str(), &result[0], result.size(), filename.c_str());
+	::GetPrivateProfileStructW(GetSection(path).c_str(), GetKey(path).c_str(), &result[0], result.size(), filename.AsNative().c_str());
 	return result;
 }
 
 std::wstring IniFileSettingsBackend::ReadSettingRaw(const SettingPath &path, const std::wstring &def) const
 {
 	std::vector<WCHAR> buf(128);
-	while(::GetPrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), def.c_str(), &buf[0], buf.size(), filename.c_str()) == buf.size() - 1)
+	while(::GetPrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), def.c_str(), &buf[0], buf.size(), filename.AsNative().c_str()) == buf.size() - 1)
 	{
 		buf.resize(buf.size() * 2);
 	}
@@ -348,7 +348,7 @@
 double IniFileSettingsBackend::ReadSettingRaw(const SettingPath &path, double def) const
 {
 	std::vector<WCHAR> buf(128);
-	while(::GetPrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(def).c_str(), &buf[0], buf.size(), filename.c_str()) == buf.size() - 1)
+	while(::GetPrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(def).c_str(), &buf[0], buf.size(), filename.AsNative().c_str()) == buf.size() - 1)
 	{
 		buf.resize(buf.size() * 2);
 	}
@@ -357,23 +357,23 @@
 
 int32 IniFileSettingsBackend::ReadSettingRaw(const SettingPath &path, int32 def) const
 {
-	return (int32)::GetPrivateProfileIntW(GetSection(path).c_str(), GetKey(path).c_str(), (UINT)def, filename.c_str());
+	return (int32)::GetPrivateProfileIntW(GetSection(path).c_str(), GetKey(path).c_str(), (UINT)def, filename.AsNative().c_str());
 }
 
 bool IniFileSettingsBackend::ReadSettingRaw(const SettingPath &path, bool def) const
 {
-	return ::GetPrivateProfileIntW(GetSection(path).c_str(), GetKey(path).c_str(), def?1:0, filename.c_str()) ? true : false;
+	return ::GetPrivateProfileIntW(GetSection(path).c_str(), GetKey(path).c_str(), def?1:0, filename.AsNative().c_str()) ? true : false;
 }
 
 
 void IniFileSettingsBackend::WriteSettingRaw(const SettingPath &path, const std::vector<char> &val)
 {
-	::WritePrivateProfileStructW(GetSection(path).c_str(), GetKey(path).c_str(), (LPVOID)&val[0], val.size(), filename.c_str());
+	::WritePrivateProfileStructW(GetSection(path).c_str(), GetKey(path).c_str(), (LPVOID)&val[0], val.size(), filename.AsNative().c_str());
 }
 
 void IniFileSettingsBackend::WriteSettingRaw(const SettingPath &path, const std::wstring &val)
 {
-	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), val.c_str(), filename.c_str());
+	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), val.c_str(), filename.AsNative().c_str());
 
 	if(mpt::String::Decode(mpt::String::Encode(val, mpt::CharsetLocale), mpt::CharsetLocale) != val)
 	{
@@ -384,29 +384,29 @@
 			// The ini file is probably ANSI encoded.
 			ConvertToUnicode();
 			// Re-write non-ansi-representable value.
-			::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), val.c_str(), filename.c_str());
+			::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), val.c_str(), filename.AsNative().c_str());
 		}
 	}
 }
 
 void IniFileSettingsBackend::WriteSettingRaw(const SettingPath &path, double val)
 {
-	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val).c_str(), filename.c_str());
+	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val).c_str(), filename.AsNative().c_str());
 }
 
 void IniFileSettingsBackend::WriteSettingRaw(const SettingPath &path, int32 val)
 {
-	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val).c_str(), filename.c_str());
+	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val).c_str(), filename.AsNative().c_str());
 }
 
 void IniFileSettingsBackend::WriteSettingRaw(const SettingPath &path, bool val)
 {
-	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val?1:0).c_str(), filename.c_str());
+	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), StringifyW(val?1:0).c_str(), filename.AsNative().c_str());
 }
 
 void IniFileSettingsBackend::RemoveSettingRaw(const SettingPath &path)
 {
-	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), NULL, filename.c_str());
+	::WritePrivateProfileStringW(GetSection(path).c_str(), GetKey(path).c_str(), NULL, filename.AsNative().c_str());
 }
 
 
@@ -434,7 +434,7 @@
 
 static std::vector<char> ReadFile(const mpt::PathString &filename)
 {
-	mpt::ifstream s(filename.c_str(), std::ios::binary);
+	mpt::ifstream s(filename.AsNative().c_str(), std::ios::binary);
 	std::vector<char> result;
 	while(s)
 	{
@@ -449,7 +449,7 @@
 static void WriteFileUTF16LE(const mpt::PathString &filename, const std::wstring &str)
 {
 	STATIC_ASSERT(sizeof(wchar_t) == 2);
-	mpt::ofstream inifile(filename.c_str(), std::ios::binary | std::ios::trunc);
+	mpt::ofstream inifile(filename.AsNative().c_str(), std::ios::binary | std::ios::trunc);
 	const uint8 UTF16LE_BOM[] = { 0xff, 0xfe };
 	inifile.write(reinterpret_cast<const char*>(UTF16LE_BOM), 2);
 	inifile.write(reinterpret_cast<const char*>(str.c_str()), str.length() * sizeof(std::wstring::value_type));
@@ -469,11 +469,8 @@
 	{
 		return;
 	}
-	const std::wstring backupFilename = backupTag.empty()
-		? filename + L".ansi.bak"
-		: filename + L".ansi." + backupTag + L".bak"
-		;
-	CopyFileW(filename.c_str(), backupFilename.c_str(), FALSE);
+	const mpt::PathString backupFilename = filename + mpt::PathString::FromWide(backupTag.empty() ? L".ansi.bak" : L".ansi." + backupTag + L".bak");
+	CopyFileW(filename.AsNative().c_str(), backupFilename.AsNative().c_str(), FALSE);
 	WriteFileUTF16LE(filename, mpt::String::Decode(std::string(&data[0], &data[0] + data.size()), mpt::CharsetLocale));
 }
 
@@ -528,7 +525,7 @@
 
 
 DefaultSettingsContainer::DefaultSettingsContainer()
-	: IniFileSettingsContainer(mpt::String::Decode(theApp.GetConfigFileName(), mpt::CharsetLocale))
+	: IniFileSettingsContainer(mpt::PathString::FromLocale(theApp.GetConfigFileName()))
 {
 	return;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3122
          http://sourceforge.net/p/modplug/code/3122
Author:   manxorist
Date:     2013-11-08 11:50:55 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] First batch of PathString conversions. Still a lot of work to do.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/AutoSaver.cpp
    trunk/OpenMPT/mptrack/AutoSaver.h
    trunk/OpenMPT/mptrack/ExceptionHandler.cpp
    trunk/OpenMPT/mptrack/InputHandler.cpp
    trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/mptrack/Settings.cpp
    trunk/OpenMPT/mptrack/Settings.h
    trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
    trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
    trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/soundlib/Load_mo3.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -203,8 +203,8 @@
 }
 
 
-CString CAutoSaver::BuildFileName(CModDoc &modDoc)
-//------------------------------------------------
+mpt::PathString CAutoSaver::BuildFileName(CModDoc &modDoc)
+//--------------------------------------------------------
 {
 	CString timeStamp = (CTime::GetCurrentTime()).Format("%Y%m%d.%H%M%S");
 	CString name;
@@ -218,7 +218,7 @@
 		} else
 		{
 			// if it doesnt, put it in settings dir
-			name = theApp.GetConfigPath() + modDoc.GetTitle();
+			name = theApp.GetConfigPath().ToCString() + modDoc.GetTitle();
 		}
 	} else
 	{
@@ -236,7 +236,7 @@
 		name.Append(modDoc.GetrSoundFile().GetModSpecifications().fileExtension);
 	}
 
-	return name;
+	return mpt::PathString::FromCString(name);
 }
 
 
@@ -247,7 +247,7 @@
 	// list with backups... hence we have duplicated code.. :(
 	CSoundFile &sndFile = modDoc.GetrSoundFile(); 
 	
-	CString fileName = BuildFileName(modDoc);
+	CString fileName = BuildFileName(modDoc).ToCString();
 
 	// We are acutally not going to show the log for autosaved files.
 	ScopedLogCapturer logcapturer(modDoc, "", nullptr, false);
@@ -296,7 +296,7 @@
 			path = fullPath.Left(fullPath.GetLength() - modDoc.GetTitle().GetLength()); //remove file name if necessary
 		} else
 		{
-			path = theApp.GetConfigPath();
+			path = theApp.GetConfigPath().ToCString();
 		}
 	} else
 	{

Modified: trunk/OpenMPT/mptrack/AutoSaver.h
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.h	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/AutoSaver.h	2013-11-08 11:50:55 UTC (rev 3122)
@@ -44,7 +44,7 @@
 //internal implementation
 private: 
 	bool SaveSingleFile(CModDoc &modDoc);
-	CString BuildFileName(CModDoc &modDoc);
+	mpt::PathString BuildFileName(CModDoc &modDoc);
 	void CleanUpBackups(CModDoc &modDoc);
 	bool CheckTimer(DWORD curTime);
 	

Modified: trunk/OpenMPT/mptrack/ExceptionHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/ExceptionHandler.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -107,7 +107,7 @@
 			if(numFiles == 0)
 			{
 				// Show the rescue directory in Explorer...
-				CTrackApp::OpenDirectory(baseRescuePath);
+				CTrackApp::OpenDirectory(mpt::PathString::FromCString(baseRescuePath));
 			}
 			CString filename;
 			filename.Format("%s%d_%s.%s", baseRescuePath, ++numFiles, pModDoc->GetTitle(), pModDoc->GetSoundFile()->GetModSpecifications().fileExtension);

Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
===================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -30,11 +30,11 @@
 	//Init CommandSet and Load defaults
 	activeCommandSet = new CCommandSet();
 	
-	CString sDefaultPath = CString(theApp.GetConfigPath()) + TEXT("Keybindings.mkb");
+	CString sDefaultPath = theApp.GetConfigPath().ToCString() + TEXT("Keybindings.mkb");
 	if (sDefaultPath.GetLength() > MAX_PATH - 1)
 		sDefaultPath = "";
 
-	const bool bNoExistingKbdFileSetting = (TrackerSettings::Instance().m_szKbdFile[0] == 0);
+	const bool bNoExistingKbdFileSetting = TrackerSettings::Instance().m_szKbdFile.empty();
 
 	// 1. Try to load keybindings from the path saved in the settings.
 	// 2. If the setting doesn't exist or the loading fails, try to load from default location.
@@ -42,10 +42,10 @@
 	// 4. If there were no keybinging setting already, create a keybinding file to default location
 	//    and set it's path to settings.
 
-	if (bNoExistingKbdFileSetting || !(activeCommandSet->LoadFile(TrackerSettings::Instance().m_szKbdFile)))
+	if (bNoExistingKbdFileSetting || !(activeCommandSet->LoadFile(TrackerSettings::Instance().m_szKbdFile.ToCString())))
 	{
 		if (bNoExistingKbdFileSetting)
-			_tcscpy(TrackerSettings::Instance().m_szKbdFile, sDefaultPath);
+			TrackerSettings::Instance().m_szKbdFile = mpt::PathString::FromCString(sDefaultPath);
 		bool bSuccess = false;
 		if (PathFileExists(sDefaultPath) == TRUE)
 			bSuccess = activeCommandSet->LoadFile(sDefaultPath);
@@ -56,14 +56,14 @@
 			bSuccess = activeCommandSet->LoadDefaultKeymap();
 			if (bSuccess && bNoExistingKbdFileSetting)
 			{
-				activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile);
+				activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile.ToCString());
 			}
 		}
 		if (bSuccess == false)
 			ErrorBox(IDS_UNABLE_TO_LOAD_KEYBINDINGS);
 	}
 	// We will only overwrite the default Keybindings.mkb file from now on.
-	_tcscpy(TrackerSettings::Instance().m_szKbdFile, sDefaultPath);
+	TrackerSettings::Instance().m_szKbdFile = mpt::PathString::FromCString(sDefaultPath);
 
 	//Get Keymap 
 	activeCommandSet->GenKeyMap(keyMap);

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -162,7 +162,7 @@
 	m_nCurKeyChoice = -1;
 	m_bModified = false;
 	m_bChoiceModified = false;
-	m_sFullPathName = TrackerSettings::Instance().m_szKbdFile;
+	m_sFullPathName = TrackerSettings::Instance().m_szKbdFile.ToCString();
 	
 	plocalCmdSet = new CCommandSet();
 	plocalCmdSet->Copy(CMainFrame::GetInputHandler()->activeCommandSet);
@@ -842,7 +842,7 @@
 		.DefaultExtension("mkb")
 		.DefaultFilename(std::string(m_sFullPathName))
 		.ExtensionFilter("OpenMPT Key Bindings (*.mkb)|*.mkb||")
-		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile);
+		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile.ToLocale());
 	if(!dlg.Show()) return;
 
 	m_sFullPathName = dlg.GetFirstFile().c_str();
@@ -859,7 +859,7 @@
 		.DefaultExtension("mkb")
 		.DefaultFilename(std::string(m_sFullPathName))
 		.ExtensionFilter("OpenMPT Key Bindings (*.mkb)|*.mkb||")
-		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile);
+		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile.ToLocale());
 	if(!dlg.Show()) return;
 
 	m_sFullPathName = dlg.GetFirstFile().c_str();

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -467,7 +467,7 @@
 
 	if(m_InputHandler && m_InputHandler->activeCommandSet)
 	{
-		m_InputHandler->activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile);
+		m_InputHandler->activeCommandSet->SaveFile(TrackerSettings::Instance().m_szKbdFile.ToCString());
 	}
 
 	EndWaitCursor();
@@ -2508,12 +2508,11 @@
 void CMainFrame::OnHelp()
 //-----------------------
 {
-	CString helpFile = theApp.GetAppDirPath();
-	helpFile += "OpenMPT Manual.pdf";
+	mpt::PathString helpFile = theApp.GetAppDirPath();
+	helpFile += mpt::PathString::FromUTF8("OpenMPT Manual.pdf");
 	if(!theApp.OpenFile(helpFile))
 	{
-		helpFile = "Could not find help file:\n" + helpFile;
-		Reporting::Error(helpFile);
+		Reporting::Error(std::string("Could not find help file:\n" + helpFile.ToLocale()).c_str());
 	}
 }
 
@@ -2530,11 +2529,11 @@
 		for(size_t i = 0; i < 2; i++) // 0: app items, 1: user items
 		{
 			// To avoid duplicates, check whether app path and config path are the same.
-			if (i == 1 && _tcsicmp(CTrackApp::GetAppDirPath(), theApp.GetConfigPath()) == 0)
+			if (i == 1 && _tcsicmp(CTrackApp::GetAppDirPath().ToCString(), theApp.GetConfigPath().ToCString()) == 0)
 				break;
 			CFileFind fileFind;
 			CFixedStringT<CString, MAX_PATH> sPath;
-			sPath = (i == 0) ? CTrackApp::GetAppDirPath() : theApp.GetConfigPath();
+			sPath = (i == 0) ? CTrackApp::GetAppDirPath().ToCString() : theApp.GetConfigPath().ToCString();
 			sPath += pszFolderName;
 			if (Util::sdOs::IsPathFileAvailable(sPath, Util::sdOs::FileModeExists) == false)
 				continue;

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -491,7 +491,7 @@
 	FileDialog dlg = OpenFileDialog()
 		.DefaultExtension("mptcolor")
 		.ExtensionFilter("OpenMPT Color Schemes|*.mptcolor||")
-		.WorkingDirectory(theApp.GetConfigPath());
+		.WorkingDirectory(theApp.GetConfigPath().ToLocale());
 	if(!dlg.Show()) return;
 
 	// Ensure that all colours are reset (for outdated colour schemes)
@@ -514,7 +514,7 @@
 	FileDialog dlg = SaveFileDialog()
 		.DefaultExtension("mptcolor")
 		.ExtensionFilter("OpenMPT Color Schemes|*.mptcolor||")
-		.WorkingDirectory(theApp.GetConfigPath());
+		.WorkingDirectory(theApp.GetConfigPath().ToLocale());
 	if(!dlg.Show()) return;
 
 	{

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -260,7 +260,7 @@
 }
 
 
-TCHAR CTrackApp::m_szExePath[_MAX_PATH] = TEXT("");
+mpt::PathString CTrackApp::m_szExePath;
 
 /////////////////////////////////////////////////////////////////////////////
 // MPTRACK Command Line options
@@ -650,8 +650,6 @@
 	m_pPluginManager = NULL;
 	m_pSoundDevicesManager = nullptr;
 	m_bInitialized = FALSE;
-	m_szConfigFileName[0] = 0;
-	m_szPluginCacheFileName[0] = 0;
 }
 
 
@@ -662,27 +660,29 @@
 // Move a config file called sFileName from the App's directory (or one of its sub directories specified by sSubDir) to
 // %APPDATA%. If specified, it will be renamed to sNewFileName. Existing files are never overwritten.
 // Returns true on success.
-bool CTrackApp::MoveConfigFile(TCHAR sFileName[_MAX_PATH], TCHAR sSubDir[_MAX_PATH], TCHAR sNewFileName[_MAX_PATH])
-//-----------------------------------------------------------------------------------------------------------------
+bool CTrackApp::MoveConfigFile(mpt::PathString sFileName, mpt::PathString sSubDir, mpt::PathString sNewFileName)
+//--------------------------------------------------------------------------------------------------------------
 {
 	// copy a config file from the exe directory to the new config dirs
-	TCHAR sOldPath[_MAX_PATH], sNewPath[_MAX_PATH];
-	strcpy(sOldPath, m_szExePath);
-	if(sSubDir[0])
-		strcat(sOldPath, sSubDir);
-	strcat(sOldPath, sFileName);
+	mpt::PathString sOldPath;
+	mpt::PathString sNewPath;
+	sOldPath = m_szExePath;
+	sOldPath += sSubDir;
+	sOldPath += sFileName;
 
-	strcpy(sNewPath, m_szConfigDirectory);
-	if(sSubDir[0])
-		strcat(sNewPath, sSubDir);
-	if(sNewFileName[0])
-		strcat(sNewPath, sNewFileName);
-	else
-		strcat(sNewPath, sFileName);
+	sNewPath = m_szConfigDirectory;
+	sNewPath += sSubDir;
+	if(!sNewFileName.empty())
+	{
+		sNewPath += sNewFileName;
+	} else
+	{
+		sNewPath += sFileName;
+	}
 
-	if(PathFileExists(sNewPath) == 0 && PathFileExists(sOldPath) != 0)
+	if(PathFileExistsW(sNewPath.AsNative().c_str()) == 0 && PathFileExistsW(sOldPath.AsNative().c_str()) != 0)
 	{
-		return (MoveFile(sOldPath, sNewPath) != 0);
+		return (MoveFileW(sOldPath.AsNative().c_str(), sNewPath.AsNative().c_str()) != 0);
 	}
 	return false;
 }
@@ -693,33 +693,39 @@
 void CTrackApp::SetupPaths(bool overridePortable)
 //-----------------------------------------------
 {
-	if(GetModuleFileName(NULL, m_szExePath, CountOf(m_szExePath)))
+	WCHAR tempExePath[MAX_PATH];
+	if(GetModuleFileNameW(NULL, tempExePath, CountOf(tempExePath)))
 	{
-		mpt::String::SetNullTerminator(m_szExePath);
-		TCHAR szDrive[_MAX_DRIVE] = "", szDir[_MAX_PATH] = "";
-		_splitpath(m_szExePath, szDrive, szDir, NULL, NULL);
-		strcpy(m_szExePath, szDrive);
-		strcat(m_szExePath, szDir);
+		mpt::String::SetNullTerminator(tempExePath);
+		wchar_t szDrive[_MAX_DRIVE] = L"";
+		wchar_t szDir[_MAX_PATH] = L"";
+		_wsplitpath(tempExePath, szDrive, szDir, NULL, NULL);
+		m_szExePath = mpt::PathString::FromNative(szDrive);
+		m_szExePath += mpt::PathString::FromNative(szDir);
 
-		GetFullPathName(m_szExePath, CountOf(szDir), szDir, NULL);
-		strcpy(m_szExePath, szDir);
+		WCHAR wcsDir[MAX_PATH];
+		GetFullPathNameW(m_szExePath.AsNative().c_str(), CountOf(wcsDir), wcsDir, NULL);
+		m_szExePath = mpt::PathString::FromNative(wcsDir);
 	}
 
-	m_szConfigDirectory[0] = 0;
+	m_szConfigDirectory = mpt::PathString();
 	// Try to find a nice directory where we should store our settings (default: %APPDATA%)
 	bool bIsAppDir = overridePortable;
-	if(!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, m_szConfigDirectory)))
+	WCHAR tempConfigDirectory[MAX_PATH];
+	tempConfigDirectory[0] = 0;
+	if(!SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, tempConfigDirectory)))
 	{
-		if(!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, m_szConfigDirectory)))
+		if(!SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, tempConfigDirectory)))
 		{
 			bIsAppDir = true;
 		}
 	}
+	m_szConfigDirectory = mpt::PathString::FromNative(tempConfigDirectory);
 
 	// Check if the user prefers to use the app's directory
-	strcpy(m_szConfigFileName, m_szExePath); // config file
-	strcat(m_szConfigFileName, "mptrack.ini");
-	if(GetPrivateProfileInt("Paths", "UseAppDataDirectory", 1, m_szConfigFileName) == 0)
+	m_szConfigFileName = m_szExePath; // config file
+	m_szConfigFileName += mpt::PathString::FromUTF8("mptrack.ini");
+	if(GetPrivateProfileIntW(L"Paths", L"UseAppDataDirectory", 1, m_szConfigFileName.AsNative().c_str()) == 0)
 	{
 		bIsAppDir = true;
 	}
@@ -727,79 +733,81 @@
 	if(!bIsAppDir)
 	{
 		// Store our app settings in %APPDATA% or "My Files"
-		strcat(m_szConfigDirectory, "\\OpenMPT\\");
+		m_szConfigDirectory += mpt::PathString::FromUTF8("\\OpenMPT\\");
 
 		// Path doesn't exist yet, so it has to be created
-		if(PathIsDirectory(m_szConfigDirectory) == 0)
+		if(PathIsDirectoryW(m_szConfigDirectory.AsNative().c_str()) == 0)
 		{
-			CreateDirectory(m_szConfigDirectory, 0);
+			CreateDirectoryW(m_szConfigDirectory.AsNative().c_str(), 0);
 		}
 
 		#ifdef WIN32	// Legacy stuff
 		// Move the config files if they're still in the old place.
-		MoveConfigFile("mptrack.ini");
-		MoveConfigFile("plugin.cache");
+		MoveConfigFile(mpt::PathString::FromUTF8("mptrack.ini"));
+		MoveConfigFile(mpt::PathString::FromUTF8("plugin.cache"));
 		#endif	// WIN32 Legacy Stuff
 	} else
 	{
-		strcpy(m_szConfigDirectory, m_szExePath);
+		m_szConfigDirectory = m_szExePath;
 	}
 
 	// Create tunings dir
-	CString sTuningPath;
-	sTuningPath.Format(TEXT("%stunings\\"), m_szConfigDirectory);
-	TrackerDirectories::Instance().SetDefaultDirectory(sTuningPath, DIR_TUNING);
+	mpt::PathString sTuningPath = m_szConfigDirectory + mpt::PathString::FromUTF8("tunings\\");
+	TrackerDirectories::Instance().SetDefaultDirectory(sTuningPath.ToLocale().c_str(), DIR_TUNING);
 
-	if(PathIsDirectory(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)) == 0)
+	if(PathIsDirectoryW(mpt::PathString::FromLocale(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)).AsNative().c_str()) == 0)
 	{
-		CreateDirectory(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING), 0);
+		CreateDirectoryW(mpt::PathString::FromLocale(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)).AsNative().c_str(), 0);
 	}
 
 	if(!bIsAppDir)
 	{
 		// Import old tunings
-		TCHAR sOldTunings[_MAX_PATH];
-		strcpy(sOldTunings, m_szExePath);
-		strcat(sOldTunings, "tunings\\");
+		mpt::PathString sOldTunings;
+		sOldTunings = m_szExePath;
+		sOldTunings += mpt::PathString::FromUTF8("tunings\\");
 
-		if(PathIsDirectory(sOldTunings) != 0)
+		if(PathIsDirectoryW(sOldTunings.AsNative().c_str()) != 0)
 		{
-			TCHAR sSearchPattern[_MAX_PATH];
-			strcpy(sSearchPattern, sOldTunings);
-			strcat(sSearchPattern, "*.*");
-			WIN32_FIND_DATA FindFileData;
+			mpt::PathString sSearchPattern;
+			sSearchPattern = sOldTunings;
+			sSearchPattern += mpt::PathString::FromUTF8("*.*");
+			WIN32_FIND_DATAW FindFileData;
 			HANDLE hFind;
-			hFind = FindFirstFile(sSearchPattern, &FindFileData);
+			hFind = FindFirstFileW(sSearchPattern.AsNative().c_str(), &FindFileData);
 			if(hFind != INVALID_HANDLE_VALUE)
 			{
 				do
 				{
-					MoveConfigFile(FindFileData.cFileName, "tunings\\");
-				} while(FindNextFile(hFind, &FindFileData) != 0);
+					MoveConfigFile(mpt::PathString::FromNative(FindFileData.cFileName), mpt::PathString::FromUTF8("tunings\\"));
+				} while(FindNextFileW(hFind, &FindFileData) != 0);
 			}
 			FindClose(hFind);
-			RemoveDirectory(sOldTunings);
+			RemoveDirectoryW(sOldTunings.AsNative().c_str());
 		}
 	}
 
 	// Set up default file locations
-	strcpy(m_szConfigFileName, m_szConfigDirectory); // config file
-	strcat(m_szConfigFileName, "mptrack.ini");
+	m_szConfigFileName = m_szConfigDirectory; // config file
+	m_szConfigFileName += mpt::PathString::FromUTF8("mptrack.ini");
 
-	strcpy(m_szPluginCacheFileName, m_szConfigDirectory); // plugin cache
-	strcat(m_szPluginCacheFileName, "plugin.cache");
+	m_szPluginCacheFileName = m_szConfigDirectory + mpt::PathString::FromUTF8("plugin.cache"); // plugin cache
 
-	TCHAR szTemplatePath[MAX_PATH];
-	_tcscpy(szTemplatePath, m_szConfigDirectory);
-	_tcscat(szTemplatePath, _T("TemplateModules\\"));
-	TrackerDirectories::Instance().SetDefaultDirectory(szTemplatePath, DIR_TEMPLATE_FILES_USER);
+	mpt::PathString szTemplatePath;
+	szTemplatePath = m_szConfigDirectory;
+	szTemplatePath += mpt::PathString::FromUTF8("TemplateModules\\");
+	TrackerDirectories::Instance().SetDefaultDirectory(szTemplatePath.ToLocale().c_str(), DIR_TEMPLATE_FILES_USER);
 
 	//Force use of custom ini file rather than windowsDir\executableName.ini
 	if(m_pszProfileName)
 	{
 		free((void *)m_pszProfileName);
 	}
-	m_pszProfileName = _tcsdup(m_szConfigFileName);
+	#ifdef UNICODE
+		m_pszProfileName = _tcsdup(m_szConfigFileName.AsNative().c_str());
+	#else
+		m_pszProfileName = _tcsdup(m_szConfigFileName.ToLocale().c_str());
+	#endif
 
 	m_bPortableMode = bIsAppDir;
 }
@@ -839,13 +847,13 @@
 	// Construct auto saver instance, class TrackerSettings expects it being available.
 	CMainFrame::m_pAutoSaver = new CAutoSaver();
 
-	m_pSettingsIniFile = new IniFileSettingsBackend(mpt::PathString::FromLocale(m_szConfigFileName));
+	m_pSettingsIniFile = new IniFileSettingsBackend(m_szConfigFileName);
 	
 	m_pSettings = new SettingsContainer(m_pSettingsIniFile);
 
 	m_pTrackerSettings = new TrackerSettings(*m_pSettings);
 
-	m_pPluginCache = new IniFileSettingsContainer(mpt::PathString::FromLocale(m_szPluginCacheFileName));
+	m_pPluginCache = new IniFileSettingsContainer(m_szPluginCacheFileName);
 
 	int mruListLength = GetSettings().Read<int32>("Misc", "MRUListLength", 10);
 	Limit(mruListLength, 0, 15);
@@ -2030,15 +2038,34 @@
 ///////////////////////////////////////////////////////////////////////////////////
 // Internet-related functions
 
-bool CTrackApp::OpenURL(const LPCSTR lpszURL)
-//-------------------------------------------
+bool CTrackApp::OpenURL(const char *url)
+//--------------------------------------
 {
-	if(lpszURL != nullptr && lpszURL[0] != '\0' && theApp.m_pMainWnd)
+	if(!url) return false;
+	return OpenURL(mpt::PathString::FromUTF8(url));
+}
+
+bool CTrackApp::OpenURL(const std::string &url)
+//---------------------------------------------
+{
+	return OpenURL(mpt::PathString::FromUTF8(url));
+}
+
+bool CTrackApp::OpenURL(const CString &url)
+//-----------------------------------------
+{
+	return OpenURL(mpt::PathString::FromCString(url));
+}
+
+bool CTrackApp::OpenURL(const mpt::PathString &lpszURL)
+//-----------------------------------------------------
+{
+	if(!lpszURL.empty() && theApp.m_pMainWnd)
 	{
-		if(reinterpret_cast<int>(ShellExecute(
+		if(reinterpret_cast<int>(ShellExecuteW(
 			theApp.m_pMainWnd->m_hWnd,
-			"open",
-			lpszURL,
+			L"open",
+			lpszURL.AsNative().c_str(),
 			NULL,
 			NULL,
 			SW_SHOW)) >= 32)
@@ -2065,7 +2092,7 @@
 
 	const size_t nStrLength = nLength - 1;	// "usable" length, i.e. not including the null char.
 	TCHAR szExePath[nLength], szTempPath[nLength];
-	_tcsncpy(szExePath, GetAppDirPath(), nStrLength);
+	_tcsncpy(szExePath, GetAppDirPath().ToCString(), nStrLength);
 	mpt::String::SetNullTerminator(szExePath);
 
 	if(!_tcsncicmp(szExePath, szPath, _tcslen(szExePath)))
@@ -2108,7 +2135,7 @@
 
 	const size_t nStrLength = nLength - 1;	// "usable" length, i.e. not including the null char.
 	TCHAR szExePath[nLength], szTempPath[nLength] = _T("");
-	_tcsncpy(szExePath, GetAppDirPath(), nStrLength);
+	_tcsncpy(szExePath, GetAppDirPath().ToCString(), nStrLength);
 	mpt::String::SetNullTerminator(szExePath);
 
 	if(!_tcsncicmp(szPath, _T("\\"), 1) && _tcsncicmp(szPath, _T("\\\\"), 2))

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 11:50:55 UTC (rev 3122)
@@ -114,10 +114,10 @@
 	DWORD m_dwTimeStarted, m_dwLastPluginIdleCall;
 	// Default macro configuration
 	MIDIMacroConfig m_MidiCfg;
-	static TCHAR m_szExePath[_MAX_PATH];
-	TCHAR m_szConfigDirectory[_MAX_PATH];
-	TCHAR m_szConfigFileName[_MAX_PATH];
-	TCHAR m_szPluginCacheFileName[_MAX_PATH];
+	static mpt::PathString m_szExePath;
+	mpt::PathString m_szConfigDirectory;
+	mpt::PathString m_szConfigFileName;
+	mpt::PathString m_szPluginCacheFileName;
 	bool m_bPortableMode;
 
 public:
@@ -131,7 +131,7 @@
 	static VOID SetAsProject(BOOL n) { m_nProject = n; }
 // -! NEW_FEATURE#0023
 
-	static LPCTSTR GetAppDirPath() {return m_szExePath;} // Returns '\'-ended executable directory path.
+	static mpt::PathString GetAppDirPath() {return m_szExePath;} // Returns '\'-ended executable directory path.
 	static MODTYPE GetDefaultDocType() { return m_nDefaultDocType; }
 	static void SetDefaultDocType(MODTYPE n) { m_nDefaultDocType = n; }
 	static LPMIDILIBSTRUCT GetMidiLibrary() { return glpMidiLibrary; }
@@ -144,9 +144,12 @@
 	static BOOL SaveDefaultDLSBanks();
 	static BOOL RemoveDLSBank(UINT nBank);
 	static BOOL AddDLSBank(LPCSTR);
-	static bool OpenURL(const LPCSTR lpszURL);
-	static bool OpenFile(const LPCSTR file) { return OpenURL(file); };
-	static bool OpenDirectory(const LPCSTR directory) { return OpenURL(directory); };
+	static bool OpenURL(const char *url);
+	static bool OpenURL(const std::string &url);
+	static bool OpenURL(const CString &url);
+	static bool OpenURL(const mpt::PathString &lpszURL);
+	static bool OpenFile(const mpt::PathString &file) { return OpenURL(file); };
+	static bool OpenDirectory(const mpt::PathString &directory) { return OpenURL(directory); };
 
 	int GetOpenDocumentCount() const;
 	std::vector<CModDoc *>GetOpenDocuments() const;
@@ -157,7 +160,7 @@
 	SoundDevicesManager *GetSoundDevicesManager() const { return m_pSoundDevicesManager; }
 	void GetDefaultMidiMacro(MIDIMacroConfig &cfg) const { cfg = m_MidiCfg; }
 	void SetDefaultMidiMacro(const MIDIMacroConfig &cfg) { m_MidiCfg = cfg; }
-	std::string GetConfigFileName() const { return m_szConfigFileName; }
+	mpt::PathString GetConfigFileName() const { return m_szConfigFileName; }
 	TrackerDirectories & GetTrackerDirectories()
 	{
 		ASSERT(m_pTrackerDirectories);
@@ -181,7 +184,7 @@
 	}
 
 	/// Returns path to config folder including trailing '\'.
-	LPCTSTR GetConfigPath() const { return m_szConfigDirectory; }
+	mpt::PathString GetConfigPath() const { return m_szConfigDirectory; }
 	void SetupPaths(bool overridePortable);
 	// Relative / absolute paths conversion
 	template <size_t nLength>
@@ -239,7 +242,7 @@
 
 
 #ifdef WIN32	// Legacy stuff
-	bool MoveConfigFile(TCHAR sFileName[_MAX_PATH], TCHAR sSubDir[_MAX_PATH] = _T(""), TCHAR sNewFileName[_MAX_PATH] = _T(""));
+	bool MoveConfigFile(mpt::PathString sFileName, mpt::PathString sSubDir = mpt::PathString(), mpt::PathString sNewFileName = mpt::PathString());
 #endif // WIN32
 
 };

Modified: trunk/OpenMPT/mptrack/Settings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Settings.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Settings.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -525,7 +525,7 @@
 
 
 DefaultSettingsContainer::DefaultSettingsContainer()
-	: IniFileSettingsContainer(mpt::PathString::FromLocale(theApp.GetConfigFileName()))
+	: IniFileSettingsContainer(theApp.GetConfigFileName())
 {
 	return;
 }

Modified: trunk/OpenMPT/mptrack/Settings.h
===================================================================
--- trunk/OpenMPT/mptrack/Settings.h	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Settings.h	2013-11-08 11:50:55 UTC (rev 3122)
@@ -296,6 +296,9 @@
 template<> inline SettingValue ToSettingValue(const CString &val) { return SettingValue(std::basic_string<TCHAR>(val.GetString())); }
 template<> inline CString FromSettingValue(const SettingValue &val) { return CString(val.as<std::basic_string<TCHAR> >().c_str()); }
 
+template<> inline SettingValue ToSettingValue(const mpt::PathString &val) { return SettingValue(val.AsNative()); }
+template<> inline mpt::PathString FromSettingValue(const SettingValue &val) { return mpt::PathString::FromNative(val); }
+
 template<> inline SettingValue ToSettingValue(const float &val) { return SettingValue(double(val)); }
 template<> inline float FromSettingValue(const SettingValue &val) { return float(val.as<double>()); }
 

Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -319,18 +319,18 @@
 	LameDynBind()
 	{
 		Reset();
-		if(!hLame) TryLoad("libmp3lame.dll", true);
-		if(!hLame) TryLoad("liblame.dll", true);
-		if(!hLame) TryLoad("mp3lame.dll", true);
-		if(!hLame) TryLoad("lame.dll", true);
-		if(!hLame) TryLoad("lame_enc.dll", false);
+		if(!hLame) TryLoad(mpt::PathString::FromUTF8("libmp3lame.dll"), true);
+		if(!hLame) TryLoad(mpt::PathString::FromUTF8("liblame.dll"), true);
+		if(!hLame) TryLoad(mpt::PathString::FromUTF8("mp3lame.dll"), true);
+		if(!hLame) TryLoad(mpt::PathString::FromUTF8("lame.dll"), true);
+		if(!hLame) TryLoad(mpt::PathString::FromUTF8("lame_enc.dll"), false);
 	}
-	void TryLoad(std::string filename, bool warn)
+	void TryLoad(mpt::PathString filename, bool warn)
 	{
 		#ifdef MODPLUG_TRACKER
-			filename = std::string(theApp.GetAppDirPath()) + filename;
+			filename = theApp.GetAppDirPath() + filename;
 		#endif
-		hLame = LoadLibrary(filename.c_str());
+		hLame = LoadLibraryW(filename.AsNative().c_str());
 		if(!hLame)
 		{
 			return;
@@ -648,21 +648,21 @@
 		Reset();
 		if(!hBlade)
 		{
-			TryLoad("lame_enc.dll");
+			TryLoad(mpt::PathString::FromUTF8("lame_enc.dll"));
 			if(hBlade) lame = 1;
 		}
 		if(!hBlade)
 		{
-			TryLoad("bladeenc.dll");
+			TryLoad(mpt::PathString::FromUTF8("bladeenc.dll"));
 			if(hBlade) lame = 0;
 		}
 	}
-	void TryLoad(std::string filename)
+	void TryLoad(mpt::PathString filename)
 	{
 		#ifdef MODPLUG_TRACKER
-			filename = std::string(theApp.GetAppDirPath()) + filename;
+			filename = theApp.GetAppDirPath() + filename;
 		#endif
-		hBlade = LoadLibrary(filename.c_str());
+		hBlade = LoadLibraryW(filename.AsNative().c_str());
 		if(!hBlade)
 		{
 			return;

Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -86,27 +86,27 @@
 		};
 		for(std::size_t i=0; i<CountOf(dll_names); ++i)
 		{
-			if(TryLoad(dll_names[i].ogg, dll_names[i].opus))
+			if(TryLoad(mpt::PathString::FromUTF8(dll_names[i].ogg), mpt::PathString::FromUTF8(dll_names[i].opus)))
 			{
 				// success
 				break;
 			}
 		}
 	}
-	bool TryLoad(std::string Ogg_fn, std::string Opus_fn)
+	bool TryLoad(mpt::PathString Ogg_fn, mpt::PathString Opus_fn)
 	{
 		#ifdef MODPLUG_TRACKER
-			Ogg_fn = std::string(theApp.GetAppDirPath()) + Ogg_fn;
-			Opus_fn = std::string(theApp.GetAppDirPath()) + Opus_fn;
+			Ogg_fn = theApp.GetAppDirPath() + Ogg_fn;
+			Opus_fn = theApp.GetAppDirPath() + Opus_fn;
 		#endif
-		hOgg = LoadLibrary(Ogg_fn.c_str());
+		hOgg = LoadLibraryW(Ogg_fn.AsNative().c_str());
 		if(!hOgg)
 		{
 			if(hOgg) { FreeLibrary(hOgg); hOgg = NULL; }
 			if(hOpus) { FreeLibrary(hOpus); hOpus = NULL; }
 			return false;
 		}
-		hOpus = LoadLibrary(Opus_fn.c_str());
+		hOpus = LoadLibraryW(Opus_fn.AsNative().c_str());
 		if(!hOpus)
 		{
 			if(hOgg) { FreeLibrary(hOgg); hOgg = NULL; }

Modified: trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -82,21 +82,21 @@
 		};
 		for(std::size_t i=0; i<CountOf(dll_names); ++i)
 		{
-			if(TryLoad(dll_names[i].ogg, dll_names[i].vorbis, dll_names[i].vorbisenc))
+			if(TryLoad(mpt::PathString::FromUTF8(dll_names[i].ogg), mpt::PathString::FromUTF8(dll_names[i].vorbis), mpt::PathString::FromUTF8(dll_names[i].vorbisenc)))
 			{
 				// success
 				break;
 			}
 		}
 	}
-	bool TryLoad(std::string Ogg_fn, std::string Vorbis_fn, std::string VorbisEnc_fn)
+	bool TryLoad(mpt::PathString Ogg_fn, mpt::PathString Vorbis_fn, mpt::PathString VorbisEnc_fn)
 	{
 		#ifdef MODPLUG_TRACKER
-			Ogg_fn = std::string(theApp.GetAppDirPath()) + Ogg_fn;
-			Vorbis_fn = std::string(theApp.GetAppDirPath()) + Vorbis_fn;
-			VorbisEnc_fn = std::string(theApp.GetAppDirPath()) + VorbisEnc_fn;
+			Ogg_fn = theApp.GetAppDirPath() + Ogg_fn;
+			Vorbis_fn = theApp.GetAppDirPath() + Vorbis_fn;
+			VorbisEnc_fn = theApp.GetAppDirPath() + VorbisEnc_fn;
 		#endif
-		hOgg = LoadLibrary(Ogg_fn.c_str());
+		hOgg = LoadLibraryW(Ogg_fn.AsNative().c_str());
 		if(!hOgg)
 		{
 			if(hOgg) { FreeLibrary(hOgg); hOgg = NULL; }
@@ -104,7 +104,7 @@
 			if(hVorbisEnc) { FreeLibrary(hVorbisEnc); hVorbisEnc = NULL; }
 			return false;
 		}
-		hVorbis = LoadLibrary(Vorbis_fn.c_str());
+		hVorbis = LoadLibraryW(Vorbis_fn.AsNative().c_str());
 		if(!hVorbis)
 		{
 			if(hOgg) { FreeLibrary(hOgg); hOgg = NULL; }
@@ -112,7 +112,7 @@
 			if(hVorbisEnc) { FreeLibrary(hVorbisEnc); hVorbisEnc = NULL; }
 			return false;
 		}
-		hVorbisEnc = LoadLibrary(VorbisEnc_fn.c_str());
+		hVorbisEnc = LoadLibraryW(VorbisEnc_fn.AsNative().c_str());
 		if(!hVorbisEnc)
 		{
 			if(hOgg) { FreeLibrary(hOgg); hOgg = NULL; }

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -246,9 +246,7 @@
 		path = theApp.RelativePathToAbsolute(path);
 		SetDefaultDirectory(path, static_cast<Directory>(i), false);
 	}
-	MemsetZero(m_szKbdFile);
-	mpt::String::Copy(m_szKbdFile, conf.Read<std::string>("Paths", "Key_Config_File", ""));
-	theApp.RelativePathToAbsolute(m_szKbdFile);
+	m_szKbdFile = conf.Read<mpt::PathString>("Paths", "Key_Config_File", mpt::PathString());
 
 
 	// init old and messy stuff:
@@ -445,6 +443,9 @@
 	{
 		SetCurrentDirectory(TrackerDirectories::Instance().m_szDefaultDirectory[DIR_MODS]);
 	}
+	CString tmpKbdFile = m_szKbdFile.ToCString();
+	theApp.RelativePathToAbsolute(tmpKbdFile);
+	m_szKbdFile = mpt::PathString::FromCString(tmpKbdFile);
 
 	// Last fixup: update config version
 	IniVersion = MptVersion::str;

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 11:50:55 UTC (rev 3122)
@@ -352,7 +352,7 @@
 
 	// Paths
 
-	TCHAR m_szKbdFile[_MAX_PATH];
+	mpt::PathString m_szKbdFile;
 
 	// Chords
 	MPTChords Chords;

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -541,7 +541,7 @@
 		mpt::String::CopyN(s, TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
 		if(!s[0])
 		{
-			mpt::String::CopyN(s, theApp.GetAppDirPath());
+			mpt::String::CopyN(s, theApp.GetAppDirPath().ToLocale().c_str());
 		}
 		size_t len = strlen(s);
 		if((len > 0) && (s[len - 1] != '\\') && (s[len - 1] != '/'))

Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -52,12 +52,9 @@
 
 	// try to load unmo3.dll dynamically.
 #ifdef MODPLUG_TRACKER
-	CHAR szPath[MAX_PATH];
-	strcpy(szPath, theApp.GetAppDirPath());
-	_tcsncat(szPath, MPT_TEXT("unmo3.dll"), MAX_PATH - (_tcslen(szPath) + 1));
-	HMODULE unmo3 = LoadLibrary(szPath);
+	HMODULE unmo3 = LoadLibraryW((theApp.GetAppDirPath() + mpt::PathString::FromUTF8("unmo3.dll")).AsNative().c_str());
 #else
-	HMODULE unmo3 = LoadLibrary(MPT_TEXT("unmo3.dll"));
+	HMODULE unmo3 = LoadLibraryW(mpt::PathString::FromUTF8("unmo3.dll").AsNative().c_str());
 #endif // MODPLUG_TRACKER
 	if(unmo3 == nullptr) // Didn't succeed.
 	{

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -2287,11 +2287,11 @@
 	}
 
 #ifdef MODPLUG_TRACKER
-	if(!mp3lib) mp3lib = LoadLibrary(CString(theApp.GetAppDirPath()) + "libmpg123-0.dll");
-	if(!mp3lib) mp3lib = LoadLibrary(CString(theApp.GetAppDirPath()) + "libmpg123.dll");
+	if(!mp3lib) mp3lib = LoadLibraryW((theApp.GetAppDirPath() + mpt::PathString::FromUTF8("libmpg123-0.dll")).AsNative().c_str());
+	if(!mp3lib) mp3lib = LoadLibraryW((theApp.GetAppDirPath() + mpt::PathString::FromUTF8("libmpg123.dll")).AsNative().c_str());
 #else
-	if(!mp3lib) mp3lib = LoadLibrary(MPT_TEXT("libmpg123-0.dll"));
-	if(!mp3lib) mp3lib = LoadLibrary(MPT_TEXT("libmpg123.dll"));
+	if(!mp3lib) mp3lib = LoadLibraryW(mpt::PathString::FromUTF8("libmpg123-0.dll").AsNative().c_str());
+	if(!mp3lib) mp3lib = LoadLibraryW(mpt::PathString::FromUTF8("libmpg123.dll").AsNative().c_str());
 #endif // MODPLUG_TRACKER
 	if(!mp3lib) return false;
 

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -891,7 +891,7 @@
 			{
 				sUrl.AppendFormat("%08X%s%%0a", LittleEndian(m_MixPlugins[*i].Info.dwPluginId2), m_MixPlugins[*i].GetLibraryName());
 			}
-			CTrackApp::OpenURL(sUrl);
+			CTrackApp::OpenURL(mpt::PathString::FromCString(sUrl));
 		}
 	}
 #endif // NO_VST

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-11-08 10:25:40 UTC (rev 3121)
+++ trunk/OpenMPT/test/test.cpp	2013-11-08 11:50:55 UTC (rev 3122)
@@ -1336,7 +1336,7 @@
 
 static bool ShouldRunTests()
 {
-	CString theFile = theApp.GetAppDirPath();
+	CString theFile = theApp.GetAppDirPath().ToCString();
 	// Only run the tests when we're in the project directory structure.
 	for(std::size_t i = 0; i < CountOf(debugPaths); ++i)
 	{
@@ -1350,7 +1350,7 @@
 
 static std::string GetTestFilenameBase()
 {
-	CString theFile = theApp.GetAppDirPath();
+	CString theFile = theApp.GetAppDirPath().ToCString();
 	for(std::size_t i = 0; i < CountOf(debugPaths); ++i)
 	{
 		if(PathEndsIn(theFile, debugPaths[i]))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3124
          http://sourceforge.net/p/modplug/code/3124
Author:   manxorist
Date:     2013-11-08 12:19:51 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Where applicable, use TrackerDirectories directly instead of indirection through TrackerSettings.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/mptrack/TuningDialog.cpp
    trunk/OpenMPT/mptrack/View_tre.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -1439,7 +1439,7 @@
 		{
 			TCHAR szName[_MAX_FNAME], szExt[_MAX_EXT];
 			_tsplitpath(lpszFileName, nullptr, nullptr, szName, szExt);
-			TrackerSettings::Instance().SetWorkingDirectory(lpszFileName, DIR_INSTRUMENTS, true);
+			TrackerDirectories::Instance().SetWorkingDirectory(lpszFileName, DIR_INSTRUMENTS, true);
 	
 			if (!pIns->name[0] && m_sndFile.GetModSpecifications().instrNameLengthMax > 0)
 			{
@@ -1689,11 +1689,11 @@
 			"GF1 Patches (*.pat)|*.pat|"
 			"Impulse Tracker Instruments (*.iti)|*.iti|"
 			"All Files (*.*)|*.*||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_INSTRUMENTS))
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_INSTRUMENTS))
 		.FilterIndex(&nLastIndex);
 	if(!dlg.Show()) return;
 
-	TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
@@ -1747,7 +1747,7 @@
 		: "Impulse Tracker Instruments (*.iti)|*.iti|"
 		"Compressed Impulse Tracker Instruments (*.iti)|*.iti|"
 		"FastTracker II Instruments (*.xi)|*.xi||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_INSTRUMENTS))
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_INSTRUMENTS))
 		.FilterIndex(&index);
 	if(!dlg.Show()) return;
 	
@@ -1772,7 +1772,7 @@
 		strcpy(szFileName, drive);
 		strcat(szFileName, path);
 		
-		TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS);
 
 // -> CODE#0023
 // -> DESC="IT project files (.itp)"

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -819,7 +819,7 @@
 	if (bOk)
 	{
 		ModSample &sample = m_sndFile.GetSample(m_nSample);
-		TrackerSettings::Instance().SetWorkingDirectory(lpszFileName, DIR_SAMPLES, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(lpszFileName, DIR_SAMPLES, true);
 		if (!sample.filename[0])
 		{
 			CHAR szName[_MAX_PATH], szExt[_MAX_EXT];
@@ -961,11 +961,11 @@
 			"AIFF Files (*.aiff;*.8svx)|*.aif;*.aiff;*.8sv;*.8svx;*.svx|"
 			"Raw Samples (*.raw,*.snd,*.pcm)|*.raw;*.snd;*.pcm|"
 			"All Files (*.*)|*.*||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_SAMPLES))
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_SAMPLES))
 		.FilterIndex(&nLastIndex);
 	if(!dlg.Show()) return;
 
-	TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
@@ -1041,7 +1041,7 @@
 		.ExtensionFilter("Wave File (*.wav)|*.wav|"
 			"FLAC File (*.flac)|*.flac|"
 			"RAW Audio (*.raw)|*.raw||")
-			.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_SAMPLES))
+			.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_SAMPLES))
 			.FilterIndex(&filter);
 	if(!dlg.Show()) return;
 
@@ -1095,7 +1095,7 @@
 		ErrorBox(IDS_ERR_SAVESMP, this);
 	} else
 	{
-		TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
 	}
 	SwitchToView();
 }

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -1604,11 +1604,11 @@
 //---------------------------------------------------------------------------------------------------------------------------------
 {
 	// will also set working directory
-	TrackerSettings::Instance().SetDefaultDirectory(szModDir, DIR_MODS);
-	TrackerSettings::Instance().SetDefaultDirectory(szSampleDir, DIR_SAMPLES);
-	TrackerSettings::Instance().SetDefaultDirectory(szInstrDir, DIR_INSTRUMENTS);
-	TrackerSettings::Instance().SetDefaultDirectory(szVstDir, DIR_PLUGINS);
-	TrackerSettings::Instance().SetDefaultDirectory(szPresetDir, DIR_PLUGINPRESETS);
+	TrackerDirectories::Instance().SetDefaultDirectory(szModDir, DIR_MODS);
+	TrackerDirectories::Instance().SetDefaultDirectory(szSampleDir, DIR_SAMPLES);
+	TrackerDirectories::Instance().SetDefaultDirectory(szInstrDir, DIR_INSTRUMENTS);
+	TrackerDirectories::Instance().SetDefaultDirectory(szVstDir, DIR_PLUGINS);
+	TrackerDirectories::Instance().SetDefaultDirectory(szPresetDir, DIR_PLUGINPRESETS);
 	return TRUE;
 }
 

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -607,10 +607,10 @@
 			.DefaultExtension(defaultExtension)
 			.DefaultFilename(s)
 			.ExtensionFilter(ModTypeToFilter(m_SndFile))
-			.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_MODS));
+			.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_MODS));
 		if(!dlg.Show()) return FALSE;
 
-		TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
 
 		strcpy(s, dlg.GetFirstFile().c_str());
 		_splitpath(s, drive, path, fname, fext);
@@ -1667,11 +1667,11 @@
 		.DefaultExtension(extension)
 		.DefaultFilename(fname)
 		.ExtensionFilter(encFactory->GetTraits().fileDescription + " (*." + extension + ")|*." + extension + "||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_EXPORT));
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_EXPORT));
 	if(!dlg.Show()) return;
 
 	// will set default dir here because there's no setup option for export dir yet (feel free to add one...)
-	TrackerSettings::Instance().SetDefaultDirectory(dlg.GetWorkingDirectory().c_str(), DIR_EXPORT, true);
+	TrackerDirectories::Instance().SetDefaultDirectory(dlg.GetWorkingDirectory().c_str(), DIR_EXPORT, true);
 
 	char drive[_MAX_DRIVE], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
 	_splitpath(dlg.GetFirstFile().c_str(), drive, dir, name, ext);
@@ -1945,7 +1945,7 @@
 		.DefaultExtension(ext)
 		.DefaultFilename(filename)
 		.ExtensionFilter(pattern)
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_MODS));
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_MODS));
 	if(!dlg.Show()) return;
 
 	ScopedLogCapturer logcapturer(*this);
@@ -2872,7 +2872,7 @@
 //----------------------------------
 {
 	// Create template folder if doesn't exist already.
-	const LPCTSTR pszTemplateFolder = TrackerSettings::Instance().GetDefaultDirectory(DIR_TEMPLATE_FILES_USER);
+	const LPCTSTR pszTemplateFolder = TrackerDirectories::Instance().GetDefaultDirectory(DIR_TEMPLATE_FILES_USER);
 	if (!PathIsDirectory(pszTemplateFolder))
 	{
 		if (!CreateDirectory(pszTemplateFolder, nullptr))

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -607,11 +607,11 @@
 	m_CheckList.SetCurSel(0);
 	OnOptionSelChanged();
 
-	SetDlgItemText(IDC_OPTIONS_DIR_MODS,		TrackerSettings::Instance().GetDefaultDirectory(DIR_MODS));
-	SetDlgItemText(IDC_OPTIONS_DIR_SAMPS,		TrackerSettings::Instance().GetDefaultDirectory(DIR_SAMPLES));
-	SetDlgItemText(IDC_OPTIONS_DIR_INSTS,		TrackerSettings::Instance().GetDefaultDirectory(DIR_INSTRUMENTS));
-	SetDlgItemText(IDC_OPTIONS_DIR_VSTS,		TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
-	SetDlgItemText(IDC_OPTIONS_DIR_VSTPRESETS,	TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINPRESETS));
+	SetDlgItemText(IDC_OPTIONS_DIR_MODS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_MODS));
+	SetDlgItemText(IDC_OPTIONS_DIR_SAMPS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES));
+	SetDlgItemText(IDC_OPTIONS_DIR_INSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_INSTRUMENTS));
+	SetDlgItemText(IDC_OPTIONS_DIR_VSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS));
+	SetDlgItemText(IDC_OPTIONS_DIR_VSTPRESETS,	TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINPRESETS));
 
 	return TRUE;
 }

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -1143,11 +1143,11 @@
 			"Wave Files (*.wav)|*.wav|"
 			"Midi Files (*.mid,*.rmi)|*.mid;*.rmi;*.smf|"
 			"All Files (*.*)|*.*||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_MODS))
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_MODS))
 		.FilterIndex(&nFilterIndex);
 	if(!dlg.Show()) return;
 
-	TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)

Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -458,10 +458,10 @@
 		.AllowMultiSelect()
 		.DefaultExtension("dll")
 		.ExtensionFilter("VST Plugins (*.dll)|*.dll||")
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_PLUGINS));
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINS));
 	if(!dlg.Show()) return;
 
-	TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINS, true);
 
 	CVstPluginManager *pManager = theApp.GetPluginManager();
 	bool bOk = false;

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -242,9 +242,9 @@
 			continue;
 		}
 		const std::string settingKey = TrackerDirectories::Instance().m_szDirectoryToSettingsName[i];
-		CString path = conf.Read<CString>("Paths", settingKey, GetDefaultDirectory(static_cast<Directory>(i)));
+		CString path = conf.Read<CString>("Paths", settingKey, TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i)));
 		path = theApp.RelativePathToAbsolute(path);
-		SetDefaultDirectory(path, static_cast<Directory>(i), false);
+		TrackerDirectories::Instance().SetDefaultDirectory(path, static_cast<Directory>(i), false);
 	}
 	m_szKbdFile = conf.Read<mpt::PathString>("Paths", "Key_Config_File", mpt::PathString());
 
@@ -653,7 +653,7 @@
 		{
 			continue;
 		}
-		CString path = GetDefaultDirectory(static_cast<Directory>(i));
+		CString path = TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i));
 		if(theApp.IsPortableMode())
 		{
 			path = theApp.AbsolutePathToRelative(path);
@@ -781,34 +781,7 @@
 }
 
 
-void TrackerSettings::SetDefaultDirectory(const LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename)
-//---------------------------------------------------------------------------------------------------------
-{
-	TrackerDirectories::Instance().SetDefaultDirectory(szFilenameFrom, dir, bStripFilename);
-}
 
-
-void TrackerSettings::SetWorkingDirectory(const LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename)
-//---------------------------------------------------------------------------------------------------------
-{
-	TrackerDirectories::Instance().SetWorkingDirectory(szFilenameFrom, dir, bStripFilename);
-}
-
-
-LPCTSTR TrackerSettings::GetDefaultDirectory(Directory dir) const
-//---------------------------------------------------------------
-{
-	return TrackerDirectories::Instance().GetDefaultDirectory(dir);
-}
-
-
-LPCTSTR TrackerSettings::GetWorkingDirectory(Directory dir) const
-//---------------------------------------------------------------
-{
-	return TrackerDirectories::Instance().GetWorkingDirectory(dir);
-}
-
-
 // retrieve / set default directory from given string and store it our setup variables
 void TrackerDirectories::SetDirectory(const LPCTSTR szFilenameFrom, Directory dir, TCHAR (&directories)[NUM_DIRS][_MAX_PATH], bool bStripFilename)
 //------------------------------------------------------------------------------------------------------------------------------------------------

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 12:19:51 UTC (rev 3124)
@@ -365,12 +365,6 @@
 
 	static void GetDefaultColourScheme(COLORREF (&colours)[MAX_MODCOLORS]);
 
-	// access to default + working directories
-	void SetWorkingDirectory(const LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	LPCTSTR GetWorkingDirectory(Directory dir) const;
-	void SetDefaultDirectory(const LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	LPCTSTR GetDefaultDirectory(Directory dir) const;
-
 	std::vector<uint32> GetSampleRates();
 
 	static MPTChords &GetChords() { return Instance().Chords; }

Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -635,7 +635,7 @@
 	FileDialog dlg = SaveFileDialog()
 		.DefaultExtension(CTuning::s_FileExtension)
 		.ExtensionFilter(filter)
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_TUNING))
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_TUNING))
 		.FilterIndex(&filterIndex);
 	if(!dlg.Show()) return;
 
@@ -676,11 +676,11 @@
 	FileDialog dlg = OpenFileDialog()
 		.AllowMultiSelect()
 		.ExtensionFilter(sFilter)
-		.WorkingDirectory(TrackerSettings::Instance().GetWorkingDirectory(DIR_TUNING));
+		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_TUNING));
 	if(!dlg.Show())
 		return;
 
-	TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_TUNING, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_TUNING, true);
 
 	CString sLoadReport;
 

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -164,7 +164,7 @@
 		m_dwStatus |= TREESTATUS_SINGLEEXPAND;
 	}
 	ModifyStyle(dwRemove, dwAdd);
-	strcpy(m_szInstrLibPath, TrackerSettings::Instance().GetDefaultDirectory(DIR_SAMPLES));
+	strcpy(m_szInstrLibPath, TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES));
 	SetImageList(CMainFrame::GetMainFrame()->GetImageList(), TVSIL_NORMAL);
 	if (!IsSampleBrowser())
 	{

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -538,7 +538,7 @@
 	{
 		// Try finding the plugin DLL in the plugin directory instead.
 		CHAR s[_MAX_PATH];
-		mpt::String::CopyN(s, TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
+		mpt::String::CopyN(s, TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS));
 		if(!s[0])
 		{
 			mpt::String::CopyN(s, theApp.GetAppDirPath().ToLocale().c_str());
@@ -1000,7 +1000,7 @@
 	// get plug directory, FSSpec on MAC, else char*
 	case audioMasterGetDirectory:
 		//Log("VST plugin to host: Get Directory\n");
-		return ToVstPtr(TrackerSettings::Instance().GetDefaultDirectory(DIR_PLUGINS));
+		return ToVstPtr(TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS));
 
 	// something has changed, update 'multi-fx' display
 	case audioMasterUpdateDisplay:
@@ -1108,7 +1108,7 @@
 			} else
 			{
 				// Plugins are probably looking for presets...?
-				//workingDir = TrackerSettings::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
+				//workingDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
 			}
 
 			FileDialog dlg = OpenFileDialog();
@@ -1589,7 +1589,7 @@
 bool CVstPlugin::SaveProgram()
 //----------------------------
 {
-	std::string defaultDir = TrackerSettings::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
 	bool useDefaultDir = !defaultDir.empty();
 	if(!useDefaultDir)
 	{
@@ -1612,7 +1612,7 @@
 
 	if(useDefaultDir)
 	{
-		TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
 	}
 
 	bool bank = (dlg.GetExtension() == "fxb");
@@ -1633,7 +1633,7 @@
 bool CVstPlugin::LoadProgram()
 //----------------------------
 {
-	std::string defaultDir = TrackerSettings::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
 	bool useDefaultDir = !defaultDir.empty();
 	if(!useDefaultDir)
 	{
@@ -1652,7 +1652,7 @@
 
 	if(useDefaultDir)
 	{
-		TrackerSettings::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
 	}
 
 	CMappedFile f;

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 12:17:23 UTC (rev 3123)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-11-08 12:19:51 UTC (rev 3124)
@@ -1721,7 +1721,7 @@
 	}
 
 	// Load local tunings.
-	s_pTuningsSharedLocal->SetSavefilePath(mpt::String::Format("%slocal_tunings%s", TrackerSettings::Instance().GetDefaultDirectory(DIR_TUNING), CTuningCollection::s_FileExtension));
+	s_pTuningsSharedLocal->SetSavefilePath(mpt::String::Format("%slocal_tunings%s", TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING), CTuningCollection::s_FileExtension));
 	s_pTuningsSharedLocal->Deserialize();
 
 	// Enabling adding/removing of tunings for standard collection

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3126
          http://sourceforge.net/p/modplug/code/3126
Author:   manxorist
Date:     2013-11-08 13:18:39 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Move _splitpath functionality into mpt::PathString.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.cpp
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp

Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp	2013-11-08 12:38:53 UTC (rev 3125)
+++ trunk/OpenMPT/common/mptString.cpp	2013-11-08 13:18:39 UTC (rev 3126)
@@ -176,3 +176,51 @@
 
 
 } } // namespace mpt::String
+
+
+#if defined(MODPLUG_TRACKER)
+
+namespace mpt {
+
+void PathString::SplitPath(PathString *drive, PathString *dir, PathString *fname, PathString *ext) const
+//------------------------------------------------------------------------------------------------------
+{
+	wchar_t tempDrive[_MAX_DRIVE];
+	wchar_t tempDir[_MAX_DIR];
+	wchar_t tempFname[_MAX_FNAME];
+	wchar_t tempExt[_MAX_EXT];
+	_wsplitpath(path.c_str(), tempDrive, tempDir, tempFname, tempExt);
+	if(drive) *drive = mpt::PathString::FromNative(tempDrive);
+	if(dir) *dir = mpt::PathString::FromNative(tempDir);
+	if(fname) *fname = mpt::PathString::FromNative(tempFname);
+	if(ext) *ext = mpt::PathString::FromNative(tempExt);
+}
+
+PathString PathString::GetDrive() const
+{
+	PathString drive;
+	SplitPath(&drive, nullptr, nullptr, nullptr);
+	return drive;
+}
+PathString PathString::GetDir() const
+{
+	PathString dir;
+	SplitPath(nullptr, &dir, nullptr, nullptr);
+	return dir;
+}
+PathString PathString::GetFileName() const
+{
+	PathString fname;
+	SplitPath(nullptr, nullptr, &fname, nullptr);
+	return fname;
+}
+PathString PathString::GetFileExt() const
+{
+	PathString ext;
+	SplitPath(nullptr, nullptr, nullptr, &ext);
+	return ext;
+}
+
+} // namespace mpt
+
+#endif

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-08 12:38:53 UTC (rev 3125)
+++ trunk/OpenMPT/common/mptString.h	2013-11-08 13:18:39 UTC (rev 3126)
@@ -162,8 +162,10 @@
 
 
 #if defined(WIN32)
-
 typedef std::wstring RawPathString;
+#else // !WIN32
+typedef std::string RawPathString;
+#endif // WIN32
 
 class PathString
 {
@@ -216,7 +218,23 @@
 		return a.AsNative() != b.AsNative();
 	}
 	bool empty() const { return path.empty(); }
+
 public:
+
+#if defined(MODPLUG_TRACKER)
+
+	void SplitPath(PathString *drive, PathString *dir, PathString *fname, PathString *ext) const;
+	PathString GetDrive() const;
+	PathString GetDir() const;
+	PathString GetFileName() const;
+	PathString GetFileExt() const;
+
+#endif
+
+public:
+
+#if defined(WIN32)
+
 	// conversions
 	MPT_DEPRECATED std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
 	std::string ToUTF8() const { return mpt::String::Encode(path, mpt::CharsetUTF8); }
@@ -245,64 +263,9 @@
 		#endif
 	}
 #endif
-};
 
 #else // !WIN32
 
-typedef std::string RawPathString;
-
-class PathString
-{
-private:
-	RawPathString path;
-private:
-	PathString(const RawPathString & path)
-		: path(path)
-	{
-		return;
-	}
-public:
-	PathString()
-	{
-		return;
-	}
-	PathString(const PathString & other)
-		: path(other.path)
-	{
-		return;
-	}
-	PathString & assign(const PathString & other)
-	{
-		path = other.path;
-		return *this;
-	}
-	PathString & operator = (const PathString & other)
-	{
-		return assign(other);
-	}
-	PathString & append(const PathString & other)
-	{
-		path.append(other.path);
-		return *this;
-	}
-	PathString & operator += (const PathString & other)
-	{
-		return append(other);
-	}
-	friend PathString operator + (const PathString & a, const PathString & b)
-	{
-		return PathString(a).append(b);
-	}
-	friend bool operator == (const PathString & a, const PathString & b)
-	{
-		return a.AsNative() == b.AsNative();
-	}
-	friend bool operator != (const PathString & a, const PathString & b)
-	{
-		return a.AsNative() != b.AsNative();
-	}
-	bool empty() const { return path.empty(); }
-public:
 	// conversions
 	std::string ToLocale() const { return path; }
 	std::string ToUTF8() const { return mpt::String::Convert(path, mpt::CharsetLocale, mpt::CharsetUTF8); }
@@ -312,10 +275,10 @@
 	static PathString FromWide(const std::wstring &path) { return PathString(mpt::String::Encode(path, mpt::CharsetLocale)); }
 	RawPathString AsNative() const { return path; }
 	static PathString FromNative(const RawPathString &path) { return PathString(path); }
-};
 
 #endif // WIN32
 
+};
 
 } // namespace mpt
 

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 12:38:53 UTC (rev 3125)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 13:18:39 UTC (rev 3126)
@@ -697,11 +697,8 @@
 	if(GetModuleFileNameW(NULL, tempExePath, CountOf(tempExePath)))
 	{
 		mpt::String::SetNullTerminator(tempExePath);
-		wchar_t szDrive[_MAX_DRIVE] = L"";
-		wchar_t szDir[_MAX_PATH] = L"";
-		_wsplitpath(tempExePath, szDrive, szDir, NULL, NULL);
-		m_szExePath = mpt::PathString::FromNative(szDrive);
-		m_szExePath += mpt::PathString::FromNative(szDir);
+		m_szExePath = mpt::PathString::FromNative(tempExePath).GetDrive();
+		m_szExePath += mpt::PathString::FromNative(tempExePath).GetDir();
 
 		WCHAR wcsDir[MAX_PATH];
 		GetFullPathNameW(m_szExePath.AsNative().c_str(), CountOf(wcsDir), wcsDir, NULL);

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 12:38:53 UTC (rev 3125)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 13:18:39 UTC (rev 3126)
@@ -791,10 +791,7 @@
 
 	if(bStripFilename)
 	{
-		wchar_t szPath[_MAX_PATH];
-		wchar_t szDir[_MAX_DIR];
-		_wsplitpath(szFilenameFrom.AsNative().c_str(), szPath, szDir, 0, 0);
-		path = mpt::PathString::FromNative(szPath) + mpt::PathString::FromNative(szDir);
+		path = szFilenameFrom.GetDrive() + szFilenameFrom.GetDir();
 	}
 	else
 	{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3127
          http://sourceforge.net/p/modplug/code/3127
Author:   manxorist
Date:     2013-11-08 14:24:25 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Add some test cases for AbsolutePathToRelative and RelativePathToAbsolute.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 13:18:39 UTC (rev 3126)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 14:24:25 UTC (rev 3127)
@@ -131,6 +131,9 @@
 	static VOID SetAsProject(BOOL n) { m_nProject = n; }
 // -! NEW_FEATURE#0023
 
+#if defined(ENABLE_TESTS)
+	static void SetAppDirPath(mpt::PathString exePath) {m_szExePath=exePath;}
+#endif
 	static mpt::PathString GetAppDirPath() {return m_szExePath;} // Returns '\'-ended executable directory path.
 	static MODTYPE GetDefaultDocType() { return m_nDefaultDocType; }
 	static void SetDefaultDocType(MODTYPE n) { m_nDefaultDocType = n; }

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-11-08 13:18:39 UTC (rev 3126)
+++ trunk/OpenMPT/test/test.cpp	2013-11-08 14:24:25 UTC (rev 3127)
@@ -576,6 +576,22 @@
 		VERIFY_EQUAL(strlen(ModSpecs::Collection[i]->volcommands), MAX_VOLCMDS);
 	}
 
+	// Path conversions
+#ifdef MODPLUG_TRACKER
+	const mpt::PathString realExePath = theApp.GetAppDirPath();
+	const CString exePath = "C:\\OpenMPT\\";
+	theApp.SetAppDirPath(mpt::PathString::FromCString(exePath));
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative("C:\\OpenMPT\\"), ".\\");
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative("c:\\OpenMPT\\foo"), ".\\foo");
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative("C:\\foo"), "\\foo");
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(".\\"), "C:\\OpenMPT\\");
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute(".\\foo"), "C:\\OpenMPT\\foo");
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute("\\foo"), "C:\\foo");
+	VERIFY_EQUAL(theApp.AbsolutePathToRelative("\\\\server\\path\\file"), "\\\\server\\path\\file");
+	VERIFY_EQUAL(theApp.RelativePathToAbsolute("\\\\server\\path\\file"), "\\\\server\\path\\file");
+	theApp.SetAppDirPath(realExePath);
+#endif
+
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3130
          http://sourceforge.net/p/modplug/code/3130
Author:   manxorist
Date:     2013-11-08 15:23:16 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Ref] Use MPT_DEPRECATED_PATH to deprecate path related conversion functions instead of the global MPT_DEPRECATED. This allows these warnings to be shut off easily.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/Mptrack.h
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/common/mptString.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -161,6 +161,9 @@
 
 
 
+//#define MPT_DEPRECATED_PATH
+#define MPT_DEPRECATED_PATH MPT_DEPRECATED
+
 #if defined(WIN32)
 typedef std::wstring RawPathString;
 #else // !WIN32
@@ -236,17 +239,17 @@
 #if defined(WIN32)
 
 	// conversions
-	MPT_DEPRECATED std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
+	MPT_DEPRECATED_PATH std::string ToLocale() const { return mpt::String::Encode(path, mpt::CharsetLocale); }
 	std::string ToUTF8() const { return mpt::String::Encode(path, mpt::CharsetUTF8); }
 	std::wstring ToWide() const { return path; }
-	MPT_DEPRECATED static PathString FromLocale(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetLocale)); }
+	MPT_DEPRECATED_PATH static PathString FromLocale(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetLocale)); }
 	static PathString FromUTF8(const std::string &path) { return PathString(mpt::String::Decode(path, mpt::CharsetUTF8)); }
 	static PathString FromWide(const std::wstring &path) { return PathString(path); }
 	RawPathString AsNative() const { return path; }
 	static PathString FromNative(const RawPathString &path) { return PathString(path); }
 #if defined(_MFC_VER)
 	// CString TCHAR, so this is CHAR or WCHAR, depending on UNICODE
-	MPT_DEPRECATED CString ToCString() const
+	MPT_DEPRECATED_PATH CString ToCString() const
 	{
 		#ifdef UNICODE
 			return path;
@@ -254,7 +257,7 @@
 			return mpt::String::Encode(path, mpt::CharsetLocale).c_str();
 		#endif
 	}
-	MPT_DEPRECATED static PathString FromCString(const CString &path)
+	MPT_DEPRECATED_PATH static PathString FromCString(const CString &path)
 	{
 		#ifdef UNICODE
 			return PathString(path.GetString());
@@ -287,30 +290,30 @@
 // Sanitize a filename (remove special chars)
 void SanitizeFilename(mpt::PathString &filename);
 
-MPT_DEPRECATED void SanitizeFilename(char *beg, char *end);
-MPT_DEPRECATED void SanitizeFilename(wchar_t *beg, wchar_t *end);
+MPT_DEPRECATED_PATH void SanitizeFilename(char *beg, char *end);
+MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t *beg, wchar_t *end);
 
-MPT_DEPRECATED void SanitizeFilename(std::string &str);
-MPT_DEPRECATED void SanitizeFilename(std::wstring &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(std::string &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(std::wstring &str);
 
 template <std::size_t size>
-MPT_DEPRECATED void SanitizeFilename(char (&buffer)[size])
-//--------------------------------------------------------
+MPT_DEPRECATED_PATH void SanitizeFilename(char (&buffer)[size])
+//-------------------------------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);
 }
 
 template <std::size_t size>
-MPT_DEPRECATED void SanitizeFilename(wchar_t (&buffer)[size])
-//-----------------------------------------------------------
+MPT_DEPRECATED_PATH void SanitizeFilename(wchar_t (&buffer)[size])
+//----------------------------------------------------------------
 {
 	STATIC_ASSERT(size > 0);
 	SanitizeFilename(buffer, buffer + size);
 }
 
 #if defined(_MFC_VER)
-MPT_DEPRECATED void SanitizeFilename(CString &str);
+MPT_DEPRECATED_PATH void SanitizeFilename(CString &str);
 #endif
 
 #endif // MODPLUG_TRACKER

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -194,11 +194,11 @@
 	mpt::PathString AbsolutePathToRelative(const mpt::PathString &path);
 	mpt::PathString RelativePathToAbsolute(const mpt::PathString &path);
 	template <size_t nLength>
-	MPT_DEPRECATED void AbsolutePathToRelative(TCHAR (&szPath)[nLength]);
-	MPT_DEPRECATED CString AbsolutePathToRelative(const CString &path);
+	MPT_DEPRECATED_PATH void AbsolutePathToRelative(TCHAR (&szPath)[nLength]);
+	MPT_DEPRECATED_PATH CString AbsolutePathToRelative(const CString &path);
 	template <size_t nLength>
-	MPT_DEPRECATED void RelativePathToAbsolute(TCHAR (&szPath)[nLength]);
-	MPT_DEPRECATED CString RelativePathToAbsolute(const CString &path);
+	MPT_DEPRECATED_PATH void RelativePathToAbsolute(TCHAR (&szPath)[nLength]);
+	MPT_DEPRECATED_PATH CString RelativePathToAbsolute(const CString &path);
 
 	/// Removes item from MRU-list; most recent item has index zero.
 	void RemoveMruItem(const int nItem);

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 15:15:50 UTC (rev 3129)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 15:23:16 UTC (rev 3130)
@@ -397,8 +397,8 @@
 
 	// Cache is necessary because users might expect long lifetimes of pointers returned from Get*Directory.
 	// Cache can be removed when all users are converted to PathString.
-	MPT_DEPRECATED TCHAR m_szDefaultDirectoryCache[NUM_DIRS][MAX_PATH];
-	MPT_DEPRECATED TCHAR m_szWorkingDirectoryCache[NUM_DIRS][MAX_PATH];
+	MPT_DEPRECATED_PATH TCHAR m_szDefaultDirectoryCache[NUM_DIRS][MAX_PATH];
+	MPT_DEPRECATED_PATH TCHAR m_szWorkingDirectoryCache[NUM_DIRS][MAX_PATH];
 
 public:
 
@@ -413,8 +413,8 @@
 
 	void SetWorkingDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
 	void SetDefaultDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	MPT_DEPRECATED LPCTSTR GetWorkingDirectory(Directory dir) const;
-	MPT_DEPRECATED LPCTSTR GetDefaultDirectory(Directory dir) const;
+	MPT_DEPRECATED_PATH LPCTSTR GetWorkingDirectory(Directory dir) const;
+	MPT_DEPRECATED_PATH LPCTSTR GetDefaultDirectory(Directory dir) const;
 
 	static TrackerDirectories &Instance();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

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

Revision: 3137
          http://sourceforge.net/p/modplug/code/3137
Author:   manxorist
Date:     2013-11-08 21:58:32 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
[Fix] Make FileDialog work with unicode paths.
[Ref] Convert TrackerDirectories completely to mpt::PathString.
[Ref] Resulting conversions from these changes all over the place.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.h
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/FileDialog.cpp
    trunk/OpenMPT/mptrack/FileDialog.h
    trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
    trunk/OpenMPT/mptrack/KeyConfigDlg.h
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h
    trunk/OpenMPT/mptrack/TuningDialog.cpp
    trunk/OpenMPT/mptrack/View_tre.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp

Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/common/mptString.h	2013-11-08 21:58:32 UTC (rev 3137)
@@ -228,6 +228,10 @@
 		return a.AsNative() != b.AsNative();
 	}
 	bool empty() const { return path.empty(); }
+	const RawPathString &NativeRef() const
+	{
+		return path;
+	}
 
 public:
 

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -1439,7 +1439,7 @@
 		{
 			TCHAR szName[_MAX_FNAME], szExt[_MAX_EXT];
 			_tsplitpath(lpszFileName, nullptr, nullptr, szName, szExt);
-			TrackerDirectories::Instance().SetWorkingDirectory(lpszFileName, DIR_INSTRUMENTS, true);
+			TrackerDirectories::Instance().SetWorkingDirectory(mpt::PathString::FromCString(lpszFileName), DIR_INSTRUMENTS, true);
 	
 			if (!pIns->name[0] && m_sndFile.GetModSpecifications().instrNameLengthMax > 0)
 			{
@@ -1693,7 +1693,7 @@
 		.FilterIndex(&nLastIndex);
 	if(!dlg.Show()) return;
 
-	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_INSTRUMENTS, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
@@ -1711,7 +1711,7 @@
 				OnInstrumentNew();
 		}
 
-		if(!OpenInstrument(files[counter].c_str()))
+		if(!OpenInstrument(files[counter].ToCString()))
 			ErrorBox(IDS_ERR_FILEOPEN, this);
 	}
 
@@ -1753,16 +1753,16 @@
 	
 	BeginWaitCursor();
 
-	_splitpath(dlg.GetFirstFile().c_str(), drive, path, NULL, ext);
+	_splitpath(dlg.GetFirstFile().ToLocale().c_str(), drive, path, NULL, ext);
 	bool ok = false;
 	if (!lstrcmpi(ext, ".iti"))
-		ok = m_sndFile.SaveITIInstrument(m_nInstrument, dlg.GetFirstFile().c_str(), index == (m_sndFile.GetType() == MOD_TYPE_XM ? 3 : 2));
+		ok = m_sndFile.SaveITIInstrument(m_nInstrument, dlg.GetFirstFile().ToLocale().c_str(), index == (m_sndFile.GetType() == MOD_TYPE_XM ? 3 : 2));
 	else
-		ok = m_sndFile.SaveXIInstrument(m_nInstrument, dlg.GetFirstFile().c_str());
+		ok = m_sndFile.SaveXIInstrument(m_nInstrument, dlg.GetFirstFile().ToLocale().c_str());
 
 // -> CODE#0023
 // -> DESC="IT project files (.itp)"
-	m_sndFile.m_szInstrumentPath[m_nInstrument - 1] = dlg.GetFirstFile();
+	m_sndFile.m_szInstrumentPath[m_nInstrument - 1] = dlg.GetFirstFile().ToLocale();
 	SetInstrumentModified(false);
 // -! NEW_FEATURE#0023
 
@@ -1772,7 +1772,7 @@
 		strcpy(szFileName, drive);
 		strcat(szFileName, path);
 		
-		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_INSTRUMENTS);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_INSTRUMENTS);
 
 // -> CODE#0023
 // -> DESC="IT project files (.itp)"

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -819,7 +819,7 @@
 	if (bOk)
 	{
 		ModSample &sample = m_sndFile.GetSample(m_nSample);
-		TrackerDirectories::Instance().SetWorkingDirectory(lpszFileName, DIR_SAMPLES, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(mpt::PathString::FromLocale(lpszFileName), DIR_SAMPLES, true);
 		if (!sample.filename[0])
 		{
 			CHAR szName[_MAX_PATH], szExt[_MAX_EXT];
@@ -965,7 +965,7 @@
 		.FilterIndex(&nLastIndex);
 	if(!dlg.Show()) return;
 
-	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_SAMPLES, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
@@ -976,7 +976,7 @@
 			OnSampleNew();
 		}
 
-		if(!OpenSample(files[counter].c_str()))
+		if(!OpenSample(files[counter].ToCString()))
 			ErrorBox(IDS_ERR_FILEOPEN, this);
 	}
 	SwitchToView();
@@ -1048,11 +1048,11 @@
 	BeginWaitCursor();
 
 	TCHAR ext[_MAX_EXT];
-	_splitpath(dlg.GetFirstFile().c_str(), NULL, NULL, NULL, ext);
+	mpt::String::Copy(ext, dlg.GetFirstFile().GetFileExt().ToCString().GetString());
 
 	bool bOk = false;
 	SAMPLEINDEX iMinSmp = m_nSample, iMaxSmp = m_nSample;
-	CString sFilename = dlg.GetFirstFile().c_str(), sNumberFormat;
+	CString sFilename = dlg.GetFirstFile().ToCString(), sNumberFormat;
 	if(doBatchSave)
 	{
 		iMinSmp = 1;
@@ -1075,7 +1075,7 @@
 				SanitizeFilename(sSampleName);
 				SanitizeFilename(sSampleFilename);
 
-				sFilename = dlg.GetFirstFile().c_str();
+				sFilename = dlg.GetFirstFile().ToCString();
 				sFilename.Replace("%sample_number%", sSampleNumber);
 				sFilename.Replace("%sample_filename%", sSampleFilename);
 				sFilename.Replace("%sample_name%", sSampleName);
@@ -1095,7 +1095,7 @@
 		ErrorBox(IDS_ERR_SAVESMP, this);
 	} else
 	{
-		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_SAMPLES, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_SAMPLES, true);
 	}
 	SwitchToView();
 }

Modified: trunk/OpenMPT/mptrack/FileDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/FileDialog.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/FileDialog.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -27,14 +27,14 @@
 	extFilter.push_back(0);
 
 	// Prepare filename buffer.
-	std::vector<TCHAR> filenameBuffer(uint16_max, 0);
+	std::vector<WCHAR> filenameBuffer(uint16_max, 0);
 	filenameBuffer.insert(filenameBuffer.begin(), defaultFilename.begin(), defaultFilename.end());
 	filenameBuffer.push_back(0);
 
 	// First, set up the dialog...
-	OPENFILENAME ofn;
+	OPENFILENAMEW ofn;
 	MemsetZero(ofn);
-	ofn.lStructSize = sizeof(OPENFILENAME);
+	ofn.lStructSize = sizeof(OPENFILENAMEW);
 	ofn.hwndOwner = theApp.m_pMainWnd->GetSafeHwnd();
 	ofn.hInstance = theApp.m_hInstance;
 	ofn.lpstrFilter = extFilter.c_str();
@@ -45,7 +45,7 @@
 	ofn.nMaxFile = filenameBuffer.size();
 	ofn.lpstrFileTitle = NULL;
 	ofn.nMaxFileTitle = 0;
-	ofn.lpstrInitialDir = workingDirectory.empty() ? NULL : workingDirectory.c_str();
+	ofn.lpstrInitialDir = workingDirectory.empty() ? NULL : workingDirectory.NativeRef().c_str();
 	ofn.lpstrTitle = NULL;
 	ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_ENABLESIZING | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | (multiSelect ? OFN_ALLOWMULTISELECT : 0) | (load ? 0 : (OFN_OVERWRITEPROMPT | OFN_NOREADONLYRETURN));
 	ofn.nFileOffset = 0;
@@ -60,7 +60,7 @@
 
 	// Do it!
 	CMainFrame::GetInputHandler()->Bypass(true);
-	BOOL result = load ? GetOpenFileName(&ofn) : GetSaveFileName(&ofn);
+	BOOL result = load ? GetOpenFileNameW(&ofn) : GetSaveFileNameW(&ofn);
 	CMainFrame::GetInputHandler()->Bypass(false);
 
 	if(result == FALSE)
@@ -76,21 +76,21 @@
 	{
 		// Multiple files might have been selected
 		int pos = ofn.nFileOffset;
-		const TCHAR *currentFile = ofn.lpstrFile + pos;
-		TCHAR filePath[MAX_PATH + 1];
-		lstrcpy(filePath, ofn.lpstrFile);
-		lstrcat(filePath, "\\");
+		const WCHAR *currentFile = ofn.lpstrFile + pos;
+		WCHAR filePath[MAX_PATH + 1];
+		lstrcpyW(filePath, ofn.lpstrFile);
+		lstrcatW(filePath, L"\\");
 
 		while(currentFile[0] != 0)
 		{
-			lstrcpy(&filePath[ofn.nFileOffset], currentFile);
-			currentFile += lstrlen(currentFile) + 1;
-			filenames.push_back(filePath);
+			lstrcpyW(&filePath[ofn.nFileOffset], currentFile);
+			currentFile += lstrlenW(currentFile) + 1;
+			filenames.push_back(mpt::PathString::FromNative(filePath));
 		}
 	} else
 	{
 		// Only one file
-		filenames.push_back(ofn.lpstrFile);
+		filenames.push_back(mpt::PathString::FromNative(ofn.lpstrFile));
 	}
 
 	if(filenames.empty())
@@ -98,8 +98,8 @@
 		return false;
 	}
 
-	workingDirectory = filenames.front().substr(0, ofn.nFileOffset);
-	defaultExtension = filenames.front().substr(ofn.nFileExtension);
+	workingDirectory = mpt::PathString::FromNative(filenames.front().AsNative().substr(0, ofn.nFileOffset));
+	extension = mpt::PathString::FromNative(filenames.front().AsNative().substr(ofn.nFileExtension));
 
 	return true;
 }

Modified: trunk/OpenMPT/mptrack/FileDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/FileDialog.h	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/FileDialog.h	2013-11-08 21:58:32 UTC (rev 3137)
@@ -16,14 +16,15 @@
 class FileDialog
 {
 public:
-	typedef std::vector<std::string> PathList;
+	typedef std::vector<mpt::PathString> PathList;
 
 protected:
-	std::string defaultExtension;
-	std::string defaultFilename;
-	std::string extFilter;
-	std::string workingDirectory;
-	std::string lastPreviewFile;
+	std::wstring defaultExtension;
+	std::wstring defaultFilename;
+	std::wstring extFilter;
+	mpt::PathString workingDirectory;
+	mpt::PathString lastPreviewFile;
+	mpt::PathString extension;
 	PathList filenames;
 	int *filterIndex;
 	bool load;
@@ -34,13 +35,19 @@
 
 public:
 	// Default extension to use if none is specified.
-	FileDialog &DefaultExtension(const std::string &ext) { defaultExtension = ext; return *this; }
+	FileDialog &DefaultExtension(const mpt::PathString &ext) { defaultExtension = ext.ToWide(); return *this; }
+	FileDialog &DefaultExtension(const std::wstring &ext) { defaultExtension = ext; return *this; }
+	FileDialog &DefaultExtension(const std::string &ext) { defaultExtension = mpt::String::Decode(ext, mpt::CharsetLocale); return *this; }
 	// Default suggested filename.
-	FileDialog &DefaultFilename(const std::string &name) { defaultFilename = name; return *this; }
+	FileDialog &DefaultFilename(const mpt::PathString &name) { defaultFilename = name.ToWide(); return *this; }
+	FileDialog &DefaultFilename(const std::wstring &name) { defaultFilename = name; return *this; }
+	FileDialog &DefaultFilename(const std::string &name) { defaultFilename = mpt::String::Decode(name, mpt::CharsetLocale); return *this; }
 	// List of possible extensions. Format: "description|extensions|...|description|extensions||"
-	FileDialog &ExtensionFilter(const std::string &filter) { extFilter = filter; return *this; }
+	FileDialog &ExtensionFilter(const mpt::PathString &filter) { extFilter = filter.ToWide(); return *this; }
+	FileDialog &ExtensionFilter(const std::wstring &filter) { extFilter = filter; return *this; }
+	FileDialog &ExtensionFilter(const std::string &filter) { extFilter = mpt::String::Decode(filter, mpt::CharsetLocale); return *this; }
 	// Default directory of the dialog.
-	FileDialog &WorkingDirectory(const std::string &dir) { workingDirectory = dir; return *this; }
+	FileDialog &WorkingDirectory(const mpt::PathString &dir) { workingDirectory = dir; return *this; }
 	// Pointer to a variable holding the index of the last extension filter to use. Holds the selected filter after the dialog has been closed.
 	FileDialog &FilterIndex(int *index) { filterIndex = index; return *this; }
 
@@ -48,13 +55,13 @@
 	bool Show();
 
 	// Get some selected file. Mostly useful when only one selected file is possible anyway.
-	const std::string &GetFirstFile() const { return filenames.front(); }
+	const mpt::PathString &GetFirstFile() const { return filenames.front(); }
 	// Gets all selected files.
 	const PathList &GetFilenames() const { return filenames; }
 	// Gets directory in which the selected files are placed.
-	const std::string &GetWorkingDirectory() const { return workingDirectory; }
+	const mpt::PathString &GetWorkingDirectory() const { return workingDirectory; }
 	// Gets the extension of the first selected file, without dot.
-	const std::string &GetExtension() const { return defaultExtension; }
+	const mpt::PathString &GetExtension() const { return extension; }
 
 protected:
 	static UINT_PTR CALLBACK OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam);

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -162,7 +162,7 @@
 	m_nCurKeyChoice = -1;
 	m_bModified = false;
 	m_bChoiceModified = false;
-	m_sFullPathName = TrackerSettings::Instance().m_szKbdFile.ToCString();
+	m_sFullPathName = TrackerSettings::Instance().m_szKbdFile;
 	
 	plocalCmdSet = new CCommandSet();
 	plocalCmdSet->Copy(CMainFrame::GetInputHandler()->activeCommandSet);
@@ -840,13 +840,13 @@
 {
 	FileDialog dlg = OpenFileDialog()
 		.DefaultExtension("mkb")
-		.DefaultFilename(std::string(m_sFullPathName))
+		.DefaultFilename(m_sFullPathName)
 		.ExtensionFilter("OpenMPT Key Bindings (*.mkb)|*.mkb||")
-		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile.ToLocale());
+		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile);
 	if(!dlg.Show()) return;
 
-	m_sFullPathName = dlg.GetFirstFile().c_str();
-	plocalCmdSet->LoadFile(m_sFullPathName);
+	m_sFullPathName = dlg.GetFirstFile();
+	plocalCmdSet->LoadFile(m_sFullPathName.ToCString());
 	ForceUpdateGUI();
 	//TentativeSetToDefaultFile(m_sFullPathName);
 }
@@ -857,13 +857,13 @@
 {	
 	FileDialog dlg = SaveFileDialog()
 		.DefaultExtension("mkb")
-		.DefaultFilename(std::string(m_sFullPathName))
+		.DefaultFilename(m_sFullPathName)
 		.ExtensionFilter("OpenMPT Key Bindings (*.mkb)|*.mkb||")
-		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile.ToLocale());
+		.WorkingDirectory(TrackerSettings::Instance().m_szKbdFile);
 	if(!dlg.Show()) return;
 
-	m_sFullPathName = dlg.GetFirstFile().c_str();
-	plocalCmdSet->SaveFile(m_sFullPathName);
+	m_sFullPathName = dlg.GetFirstFile();
+	plocalCmdSet->SaveFile(m_sFullPathName.ToCString());
 	//TentativeSetToDefaultFile(m_sFullPathName);
 }
 

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.h	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.h	2013-11-08 21:58:32 UTC (rev 3137)
@@ -103,7 +103,7 @@
 	CEdit m_eReport, m_eChordWaitTime;
 	UINT m_nKeyboardCfg;
 	int m_nCurHotKey, m_nCurCategory, m_nCurKeyChoice;
-	CString m_sFullPathName;
+	mpt::PathString m_sFullPathName;
 	CCommandSet *plocalCmdSet;
 	bool m_bForceUpdate;
 	bool m_bModified;

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -1598,8 +1598,8 @@
 }
 
 
-BOOL CMainFrame::SetupDirectories(LPCTSTR szModDir, LPCTSTR szSampleDir, LPCTSTR szInstrDir, LPCTSTR szVstDir, LPCTSTR szPresetDir)
-//---------------------------------------------------------------------------------------------------------------------------------
+BOOL CMainFrame::SetupDirectories(const mpt::PathString &szModDir, const mpt::PathString &szSampleDir, const mpt::PathString &szInstrDir, const mpt::PathString &szVstDir, const mpt::PathString &szPresetDir)
+//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 {
 	// will also set working directory
 	TrackerDirectories::Instance().SetDefaultDirectory(szModDir, DIR_MODS);
@@ -1857,7 +1857,7 @@
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
 	{
-		CTrackApp::AddDLSBank(files[counter].c_str());
+		CTrackApp::AddDLSBank(files[counter].ToLocale().c_str());
 	}
 	m_wndTree.RefreshDlsBanks();
 	EndWaitCursor();
@@ -1876,7 +1876,7 @@
 	if(!dlg.Show()) return;
 
 	BeginWaitCursor();
-	CTrackApp::ImportMidiConfig(dlg.GetFirstFile().c_str());
+	CTrackApp::ImportMidiConfig(dlg.GetFirstFile().ToLocale().c_str());
 	m_wndTree.RefreshMidiLibrary();
 	EndWaitCursor();
 }

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2013-11-08 21:58:32 UTC (rev 3137)
@@ -441,7 +441,7 @@
 	BOOL SetupMiscOptions();
 	BOOL SetupPlayer();
 
-	BOOL SetupDirectories(LPCTSTR szModDir, LPCTSTR szSampleDir, LPCTSTR szInstrDir, LPCTSTR szVstDir, LPCTSTR szPresetDir);
+	BOOL SetupDirectories(const mpt::PathString &szModDir, const mpt::PathString &szSampleDir, const mpt::PathString &szInstrDir, const mpt::PathString &szVstDir, const mpt::PathString &szPresetDir);
 	BOOL SetupMidi(DWORD d, LONG n);
 	void SetPreAmp(UINT n);
 	HWND GetFollowSong() const;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -610,9 +610,9 @@
 			.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_MODS));
 		if(!dlg.Show()) return FALSE;
 
-		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_MODS, true);
 
-		strcpy(s, dlg.GetFirstFile().c_str());
+		strcpy(s, dlg.GetFirstFile().ToLocale().c_str());
 		_splitpath(s, drive, path, fname, fext);
 	} else
 	{
@@ -1671,10 +1671,10 @@
 	if(!dlg.Show()) return;
 
 	// will set default dir here because there's no setup option for export dir yet (feel free to add one...)
-	TrackerDirectories::Instance().SetDefaultDirectory(dlg.GetWorkingDirectory().c_str(), DIR_EXPORT, true);
+	TrackerDirectories::Instance().SetDefaultDirectory(dlg.GetWorkingDirectory(), DIR_EXPORT, true);
 
 	char drive[_MAX_DRIVE], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT];
-	_splitpath(dlg.GetFirstFile().c_str(), drive, dir, name, ext);
+	_splitpath(dlg.GetFirstFile().ToLocale().c_str(), drive, dir, name, ext);
 	const CString fileName = CString(drive) + CString(dir) + CString(name);
 	const CString fileExt = CString(ext);
 
@@ -1890,7 +1890,7 @@
 		.ExtensionFilter("Midi Files (*.mid,*.rmi)|*.mid;*.rmi||");
 	if(!dlg.Show()) return;
 
-	CModToMidi mididlg(dlg.GetFirstFile().c_str(), &m_SndFile, pMainFrm);
+	CModToMidi mididlg(dlg.GetFirstFile().ToLocale().c_str(), &m_SndFile, pMainFrm);
 	if(mididlg.DoModal() == IDOK)
 	{
 		BeginWaitCursor();
@@ -1953,10 +1953,10 @@
 	switch (type)
 	{
 		case MOD_TYPE_XM:
-			m_SndFile.SaveXM(dlg.GetFirstFile().c_str(), true);
+			m_SndFile.SaveXM(dlg.GetFirstFile().ToLocale().c_str(), true);
 			break;
 		case MOD_TYPE_IT:
-			m_SndFile.SaveIT(dlg.GetFirstFile().c_str(), true);
+			m_SndFile.SaveIT(dlg.GetFirstFile().ToLocale().c_str(), true);
 			break;
 	}
 }
@@ -2872,10 +2872,12 @@
 //----------------------------------
 {
 	// Create template folder if doesn't exist already.
-	const LPCTSTR pszTemplateFolder = TrackerDirectories::Instance().GetDefaultDirectory(DIR_TEMPLATE_FILES_USER);
-	if (!PathIsDirectory(pszTemplateFolder))
+	const mpt::PathString templateFolder = TrackerDirectories::Instance().GetDefaultDirectory(DIR_TEMPLATE_FILES_USER);
+	const CString templateFolderDummy = templateFolder.ToCString();
+	const LPCTSTR pszTemplateFolder = templateFolderDummy;
+	if (!PathIsDirectoryW(templateFolder.AsNative().c_str()))
 	{
-		if (!CreateDirectory(pszTemplateFolder, nullptr))
+		if (!CreateDirectoryW(templateFolder.AsNative().c_str(), nullptr))
 		{
 			CString sErrMsg;
 			AfxFormatString1(sErrMsg, IDS_UNABLE_TO_CREATE_USER_TEMPLATE_FOLDER, pszTemplateFolder);
@@ -2899,12 +2901,12 @@
 		.DefaultExtension(m_SndFile.GetModSpecifications().fileExtension)
 		.DefaultFilename(std::string(sName))
 		.ExtensionFilter(ModTypeToFilter(m_SndFile))
-		.WorkingDirectory(pszTemplateFolder);
+		.WorkingDirectory(templateFolder);
 	if(!dlg.Show())
 		return;
 
 	const CString sOldPath = m_strPathName;
-	OnSaveDocument(dlg.GetFirstFile().c_str(), true/*template file*/);
+	OnSaveDocument(dlg.GetFirstFile().ToCString(), true/*template file*/);
 	m_strPathName = sOldPath;
 }
 

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -491,13 +491,13 @@
 	FileDialog dlg = OpenFileDialog()
 		.DefaultExtension("mptcolor")
 		.ExtensionFilter("OpenMPT Color Schemes|*.mptcolor||")
-		.WorkingDirectory(theApp.GetConfigPath().ToLocale());
+		.WorkingDirectory(theApp.GetConfigPath());
 	if(!dlg.Show()) return;
 
 	// Ensure that all colours are reset (for outdated colour schemes)
 	OnPresetMPT();
 	{
-		IniFileSettingsContainer file(mpt::PathString::FromLocale(dlg.GetFirstFile()));
+		IniFileSettingsContainer file(dlg.GetFirstFile());
 		for(int i = 0; i < MAX_MODCOLORS; i++)
 		{
 			TCHAR sKeyName[16];
@@ -514,11 +514,11 @@
 	FileDialog dlg = SaveFileDialog()
 		.DefaultExtension("mptcolor")
 		.ExtensionFilter("OpenMPT Color Schemes|*.mptcolor||")
-		.WorkingDirectory(theApp.GetConfigPath().ToLocale());
+		.WorkingDirectory(theApp.GetConfigPath());
 	if(!dlg.Show()) return;
 
 	{
-		IniFileSettingsContainer file(mpt::PathString::FromLocale(dlg.GetFirstFile()));
+		IniFileSettingsContainer file(dlg.GetFirstFile());
 		for(int i = 0; i < MAX_MODCOLORS; i++)
 		{
 			TCHAR sKeyName[16];
@@ -607,11 +607,11 @@
 	m_CheckList.SetCurSel(0);
 	OnOptionSelChanged();
 
-	SetDlgItemText(IDC_OPTIONS_DIR_MODS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_MODS));
-	SetDlgItemText(IDC_OPTIONS_DIR_SAMPS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES));
-	SetDlgItemText(IDC_OPTIONS_DIR_INSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_INSTRUMENTS));
-	SetDlgItemText(IDC_OPTIONS_DIR_VSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS));
-	SetDlgItemText(IDC_OPTIONS_DIR_VSTPRESETS,	TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINPRESETS));
+	SetDlgItemText(IDC_OPTIONS_DIR_MODS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_MODS).ToCString());
+	SetDlgItemText(IDC_OPTIONS_DIR_SAMPS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES).ToCString());
+	SetDlgItemText(IDC_OPTIONS_DIR_INSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_INSTRUMENTS).ToCString());
+	SetDlgItemText(IDC_OPTIONS_DIR_VSTS,		TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS).ToCString());
+	SetDlgItemText(IDC_OPTIONS_DIR_VSTPRESETS,	TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINPRESETS).ToCString());
 
 	return TRUE;
 }
@@ -640,7 +640,13 @@
 	CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
 	if (pMainFrm)
 	{
-		pMainFrm->SetupDirectories(szModDir, szSmpDir, szInsDir, szVstDir, szPresetDir);
+		pMainFrm->SetupDirectories(
+			mpt::PathString::FromCString(szModDir),
+			mpt::PathString::FromCString(szSmpDir),
+			mpt::PathString::FromCString(szInsDir),
+			mpt::PathString::FromCString(szVstDir),
+			mpt::PathString::FromCString(szPresetDir)
+			);
 		pMainFrm->SetupMiscOptions();
 	}
 

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -750,11 +750,11 @@
 
 	// Create tunings dir
 	mpt::PathString sTuningPath = m_szConfigDirectory + mpt::PathString::FromUTF8("tunings\\");
-	TrackerDirectories::Instance().SetDefaultDirectory(sTuningPath.ToLocale().c_str(), DIR_TUNING);
+	TrackerDirectories::Instance().SetDefaultDirectory(sTuningPath, DIR_TUNING);
 
-	if(PathIsDirectoryW(mpt::PathString::FromLocale(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)).AsNative().c_str()) == 0)
+	if(PathIsDirectoryW(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING).AsNative().c_str()) == 0)
 	{
-		CreateDirectoryW(mpt::PathString::FromLocale(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING)).AsNative().c_str(), 0);
+		CreateDirectoryW(TrackerDirectories::Instance().GetDefaultDirectory(DIR_TUNING).AsNative().c_str(), 0);
 	}
 
 	if(!bIsAppDir)
@@ -793,7 +793,7 @@
 	mpt::PathString szTemplatePath;
 	szTemplatePath = m_szConfigDirectory;
 	szTemplatePath += mpt::PathString::FromUTF8("TemplateModules\\");
-	TrackerDirectories::Instance().SetDefaultDirectory(szTemplatePath.ToLocale().c_str(), DIR_TEMPLATE_FILES_USER);
+	TrackerDirectories::Instance().SetDefaultDirectory(szTemplatePath, DIR_TEMPLATE_FILES_USER);
 
 	//Force use of custom ini file rather than windowsDir\executableName.ini
 	if(m_pszProfileName)
@@ -1144,12 +1144,12 @@
 		.FilterIndex(&nFilterIndex);
 	if(!dlg.Show()) return;
 
-	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_MODS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_MODS, true);
 
 	const FileDialog::PathList &files = dlg.GetFilenames();
 	for(size_t counter = 0; counter < files.size(); counter++)
 	{
-		OpenDocumentFile(files[counter].c_str());
+		OpenDocumentFile(files[counter].ToCString());
 	}
 }
 

Modified: trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/SelectPluginDialog.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -461,7 +461,7 @@
 		.WorkingDirectory(TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINS));
 	if(!dlg.Show()) return;
 
-	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINS, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_PLUGINS, true);
 
 	CVstPluginManager *pManager = theApp.GetPluginManager();
 	bool bOk = false;
@@ -471,7 +471,7 @@
 	for(size_t counter = 0; counter < files.size(); counter++)
 	{
 
-		CString sFilename = files[counter].c_str();
+		CString sFilename = files[counter].ToCString();
 
 		if (pManager)
 		{

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -242,7 +242,7 @@
 			continue;
 		}
 		const std::string settingKey = TrackerDirectories::Instance().m_szDirectoryToSettingsName[i];
-		CString path = conf.Read<CString>("Paths", settingKey, TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i)));
+		mpt::PathString path = conf.Read<mpt::PathString>("Paths", settingKey, TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i)));
 		path = theApp.RelativePathToAbsolute(path);
 		TrackerDirectories::Instance().SetDefaultDirectory(path, static_cast<Directory>(i), false);
 	}
@@ -438,7 +438,6 @@
 	for(size_t i = 0; i < NUM_DIRS; i++)
 	{
 		TrackerDirectories::Instance().m_szWorkingDirectory[i] = TrackerDirectories::Instance().m_szDefaultDirectory[i];
-		mpt::String::Copy(TrackerDirectories::Instance().m_szWorkingDirectoryCache[i], TrackerDirectories::Instance().m_szDefaultDirectoryCache[i]);
 	}
 	if(!TrackerDirectories::Instance().m_szDefaultDirectory[DIR_MODS].empty())
 	{
@@ -654,12 +653,12 @@
 		{
 			continue;
 		}
-		CString path = TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i));
+		mpt::PathString path = TrackerDirectories::Instance().GetDefaultDirectory(static_cast<Directory>(i));
 		if(theApp.IsPortableMode())
 		{
 			path = theApp.AbsolutePathToRelative(path);
 		}
-		conf.Write<CString>("Paths", TrackerDirectories::Instance().m_szDirectoryToSettingsName[i], path);
+		conf.Write<mpt::PathString>("Paths", TrackerDirectories::Instance().m_szDirectoryToSettingsName[i], path);
 	}
 	// Obsolete, since we always write to Keybindings.mkb now.
 	// Older versions of OpenMPT 1.18+ will look for this file if this entry is missing, so removing this entry after having read it is kind of backwards compatible.
@@ -784,8 +783,8 @@
 
 
 // retrieve / set default directory from given string and store it our setup variables
-void TrackerDirectories::SetDirectory(const mpt::PathString &szFilenameFrom, Directory dir, mpt::PathString (&directories)[NUM_DIRS], TCHAR (&pDirsCache)[NUM_DIRS][MAX_PATH], bool bStripFilename)
-//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+void TrackerDirectories::SetDirectory(const mpt::PathString &szFilenameFrom, Directory dir, mpt::PathString (&directories)[NUM_DIRS], bool bStripFilename)
+//--------------------------------------------------------------------------------------------------------------------------------------------------------
 {
 	mpt::PathString path;
 
@@ -801,7 +800,6 @@
 	mpt::PathString szOldDir = directories[dir]; // for comparison
 
 	directories[dir] = path;
-	_tcscpy(pDirsCache[dir], path.ToCString());
 
 	// When updating default directory, also update the working directory.
 	if(!path.empty() && directories == m_szDefaultDirectory)
@@ -814,60 +812,37 @@
 void TrackerDirectories::SetDefaultDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename)
 //---------------------------------------------------------------------------------------------------------------------
 {
-	SetDirectory(szFilenameFrom, dir, m_szDefaultDirectory, m_szDefaultDirectoryCache, bStripFilename);
+	SetDirectory(szFilenameFrom, dir, m_szDefaultDirectory, bStripFilename);
 }
 
 
 void TrackerDirectories::SetWorkingDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename)
 //---------------------------------------------------------------------------------------------------------------------
 {
-	SetDirectory(szFilenameFrom, dir, m_szWorkingDirectory, m_szWorkingDirectoryCache, bStripFilename);
+	SetDirectory(szFilenameFrom, dir, m_szWorkingDirectory, bStripFilename);
 }
 
 
-mpt::PathString TrackerDirectories::GetDefaultDirectoryAsPathString(Directory dir) const
-//--------------------------------------------------------------------------------------
+mpt::PathString TrackerDirectories::GetDefaultDirectory(Directory dir) const
+//--------------------------------------------------------------------------
 {
 	return m_szDefaultDirectory[dir];
 }
 
 
-mpt::PathString TrackerDirectories::GetWorkingDirectoryAsPathString(Directory dir) const
-//--------------------------------------------------------------------------------------
+mpt::PathString TrackerDirectories::GetWorkingDirectory(Directory dir) const
+//--------------------------------------------------------------------------
 {
 	return m_szWorkingDirectory[dir];
 }
 
 
-void TrackerDirectories::SetDefaultDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename)
-//---------------------------------------------------------------------------------------------------------------------
-{
-	SetDefaultDirectory(mpt::PathString::FromLocale(szFilenameFrom), dir, bStripFilename);
-}
-void TrackerDirectories::SetWorkingDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename)
-//---------------------------------------------------------------------------------------------------------------------
-{
-	SetWorkingDirectory(mpt::PathString::FromLocale(szFilenameFrom), dir, bStripFilename);
-}
-LPCTSTR TrackerDirectories::GetDefaultDirectory(Directory dir) const
-//------------------------------------------------------------------
-{
-	return m_szDefaultDirectoryCache[dir];
-}
-LPCTSTR TrackerDirectories::GetWorkingDirectory(Directory dir) const
-//------------------------------------------------------------------
-{
-	return m_szWorkingDirectoryCache[dir];
-}
 
 
-
-
 TrackerDirectories::TrackerDirectories()
 //--------------------------------------
 {
-	MemsetZero(m_szDefaultDirectoryCache);
-	MemsetZero(m_szWorkingDirectoryCache);
+	return;
 }
 
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2013-11-08 21:58:32 UTC (rev 3137)
@@ -395,11 +395,6 @@
 	// Directory to INI setting translation
 	static const TCHAR *m_szDirectoryToSettingsName[NUM_DIRS];
 
-	// Cache is necessary because users might expect long lifetimes of pointers returned from Get*Directory.
-	// Cache can be removed when all users are converted to PathString.
-	MPT_DEPRECATED_PATH TCHAR m_szDefaultDirectoryCache[NUM_DIRS][MAX_PATH];
-	MPT_DEPRECATED_PATH TCHAR m_szWorkingDirectoryCache[NUM_DIRS][MAX_PATH];
-
 public:
 
 	TrackerDirectories();
@@ -407,19 +402,14 @@
 
 	// access to default + working directories
 	void SetWorkingDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename = false);
-	mpt::PathString GetWorkingDirectoryAsPathString(Directory dir) const;
+	mpt::PathString GetWorkingDirectory(Directory dir) const;
 	void SetDefaultDirectory(const mpt::PathString &szFilenameFrom, Directory dir, bool bStripFilename = false);
-	mpt::PathString GetDefaultDirectoryAsPathString(Directory dir) const;
+	mpt::PathString GetDefaultDirectory(Directory dir) const;
 
-	void SetWorkingDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	void SetDefaultDirectory(LPCTSTR szFilenameFrom, Directory dir, bool bStripFilename = false);
-	MPT_DEPRECATED_PATH LPCTSTR GetWorkingDirectory(Directory dir) const;
-	MPT_DEPRECATED_PATH LPCTSTR GetDefaultDirectory(Directory dir) const;
-
 	static TrackerDirectories &Instance();
 
 protected:
 
-	void SetDirectory(const mpt::PathString &szFilenameFrom, Directory dir, mpt::PathString (&pDirs)[NUM_DIRS], TCHAR (&pDirsCache)[NUM_DIRS][MAX_PATH], bool bStripFilename);
+	void SetDirectory(const mpt::PathString &szFilenameFrom, Directory dir, mpt::PathString (&pDirs)[NUM_DIRS], bool bStripFilename);
 
 };

Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -643,7 +643,7 @@
 
 	bool failure = true;
 	
-	mpt::ofstream fout(dlg.GetFirstFile().c_str(), std::ios::binary);
+	mpt::ofstream fout(dlg.GetFirstFile().AsNative().c_str(), std::ios::binary);
 
 	if(filterIndex == 0)
 	{
@@ -680,7 +680,7 @@
 	if(!dlg.Show())
 		return;
 
-	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_TUNING, true);
+	TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_TUNING, true);
 
 	CString sLoadReport;
 
@@ -689,7 +689,7 @@
 	for(size_t counter = 0; counter < nFiles; counter++)
 	{
 		TCHAR szFileName[_MAX_FNAME], szExt[_MAX_EXT];
-		_tsplitpath(files[counter].c_str(), nullptr, nullptr, szFileName, szExt);
+		_tsplitpath(files[counter].ToCString(), nullptr, nullptr, szFileName, szExt);
 
 		_tcslwr(szExt); // Convert extension to lower case.
 
@@ -702,7 +702,7 @@
 
 			if (bIsTun)
 			{
-				mpt::ifstream fin(files[counter].c_str(), std::ios::binary);
+				mpt::ifstream fin(files[counter].AsNative().c_str(), std::ios::binary);
 				pT = CTuningRTI::DeserializeOLD(fin);
 				if(pT == 0)
 					{fin.clear(); fin.seekg(0); pT = CTuningRTI::Deserialize(fin);}
@@ -736,7 +736,7 @@
 			}
 			else // scl import.
 			{
-				EnSclImport a = ImportScl(files[counter].c_str(), szFileName);
+				EnSclImport a = ImportScl(files[counter].ToCString(), szFileName);
 				if (a != enSclImportOk)
 				{
 					if (a == enSclImportAddTuningFailure && m_TempTunings.GetNumTunings() >= CTuningCollection::s_nMaxTuningCount)
@@ -770,7 +770,7 @@
 			// a separate collection - no possibility to 
 			// directly replace some collection.
 			CTuningCollection* pNewTCol = new CTuningCollection;
-			pNewTCol->SetSavefilePath(files[counter]);
+			pNewTCol->SetSavefilePath(files[counter].ToLocale());
 			if (pNewTCol->Deserialize())
 			{
 				delete pNewTCol; pNewTCol = 0;

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -164,7 +164,7 @@
 		m_dwStatus |= TREESTATUS_SINGLEEXPAND;
 	}
 	ModifyStyle(dwRemove, dwAdd);
-	strcpy(m_szInstrLibPath, TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES));
+	mpt::String::Copy(m_szInstrLibPath, TrackerDirectories::Instance().GetDefaultDirectory(DIR_SAMPLES).ToLocale());
 	SetImageList(CMainFrame::GetMainFrame()->GetImageList(), TVSIL_NORMAL);
 	if (!IsSampleBrowser())
 	{
@@ -1521,9 +1521,9 @@
 	if(!dlg.Show()) return FALSE;
 
 	if (dwItem & 0x80)
-		return SetMidiPercussion(dwItem & 0x7F, dlg.GetFirstFile().c_str());
+		return SetMidiPercussion(dwItem & 0x7F, dlg.GetFirstFile().ToCString());
 	else
-		return SetMidiInstrument(dwItem, dlg.GetFirstFile().c_str());
+		return SetMidiInstrument(dwItem, dlg.GetFirstFile().ToCString());
 }
 
 
@@ -3089,7 +3089,7 @@
 			.ExtensionFilter("All files(*.*)|*.*||");
 		if(!dlg.Show()) return;
 
-		pSndFile->m_szInstrumentPath[modItem.val1 - 1] = dlg.GetFirstFile();
+		pSndFile->m_szInstrumentPath[modItem.val1 - 1] = dlg.GetFirstFile().ToLocale();
 		OnRefreshTree();
 	}
 }
@@ -3117,7 +3117,7 @@
 				"FastTracker II Instruments (*.xi)|*.xi||");
 			if(!dlg.Show()) return;
 
-			pSndFile->m_szInstrumentPath[modItem.val1 - 1] = dlg.GetFirstFile();
+			pSndFile->m_szInstrumentPath[modItem.val1 - 1] = dlg.GetFirstFile().ToLocale();
 		}
 
 		pModDoc->SaveInstrument(static_cast<INSTRUMENTINDEX>(modItem.val1));
@@ -3155,7 +3155,7 @@
 			"All Files (*.*)|*.*||");
 	if(!dlg.Show()) return;
 
-	CTrackApp::ExportMidiConfig(dlg.GetFirstFile().c_str());
+	CTrackApp::ExportMidiConfig(dlg.GetFirstFile().ToLocale().c_str());
 }
 
 

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 18:34:48 UTC (rev 3136)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-11-08 21:58:32 UTC (rev 3137)
@@ -538,7 +538,7 @@
 	{
 		// Try finding the plugin DLL in the plugin directory instead.
 		CHAR s[_MAX_PATH];
-		mpt::String::CopyN(s, TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS));
+		mpt::String::Copy(s, TrackerDirectories::Instance().GetDefaultDirectory(DIR_PLUGINS).ToLocale());
 		if(!s[0])
 		{
 			mpt::String::CopyN(s, theApp.GetAppDirPath().ToLocale().c_str());
@@ -1123,7 +1123,7 @@
 				dlg = OpenFileDialog().AllowMultiSelect();
 			}
 			dlg.ExtensionFilter(extensions)
-				.WorkingDirectory(workingDir);
+				.WorkingDirectory(mpt::PathString::FromLocale(workingDir));
 			if(!dlg.Show())
 			{
 				return 0;
@@ -1137,8 +1137,8 @@
 				fileSel->returnMultiplePaths = new char *[fileSel->nbReturnPath];
 				for(size_t i = 0; i < files.size(); i++)
 				{
-					char *fname = new char[files[i].length() + 1];
-					strcpy(fname, files[i].c_str());
+					char *fname = new char[files[i].ToLocale().length() + 1];
+					strcpy(fname, files[i].ToLocale().c_str());
 					fileSel->returnMultiplePaths[i] = fname;
 				}
 				return 1;
@@ -1156,7 +1156,7 @@
 				{
 
 					// Provide some memory for the return path.
-					fileSel->sizeReturnPath = dlg.GetFirstFile().length() + 1;
+					fileSel->sizeReturnPath = dlg.GetFirstFile().ToLocale().length() + 1;
 					fileSel->returnPath = new char[fileSel->sizeReturnPath];
 					if(fileSel->returnPath == nullptr)
 					{
@@ -1168,7 +1168,7 @@
 				{
 					fileSel->reserved = 0;
 				}
-				strncpy(fileSel->returnPath, dlg.GetFirstFile().c_str(), fileSel->sizeReturnPath - 1);
+				strncpy(fileSel->returnPath, dlg.GetFirstFile().ToLocale().c_str(), fileSel->sizeReturnPath - 1);
 				fileSel->nbReturnPath = 1;
 				fileSel->returnMultiplePaths = nullptr;
 			}
@@ -1592,7 +1592,7 @@
 bool CVstPlugin::SaveProgram()
 //----------------------------
 {
-	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS).ToLocale();
 	bool useDefaultDir = !defaultDir.empty();
 	if(!useDefaultDir)
 	{
@@ -1606,21 +1606,21 @@
 	mpt::String::SetNullTerminator(rawname);
 
 	FileDialog dlg = SaveFileDialog()
-		.DefaultExtension("fxp")
+		.DefaultExtension(mpt::PathString::FromUTF8("fxb"))
 		.DefaultFilename(rawname)
 		.ExtensionFilter("VST Plugin Programs (*.fxp)|*.fxp|"
 			"VST Plugin Banks (*.fxb)|*.fxb||")
-		.WorkingDirectory(defaultDir);
+		.WorkingDirectory(mpt::PathString::FromLocale(defaultDir));
 	if(!dlg.Show()) return false;
 
 	if(useDefaultDir)
 	{
-		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_PLUGINPRESETS, true);
 	}
 
-	bool bank = (dlg.GetExtension() == "fxb");
+	bool bank = (dlg.GetExtension() == mpt::PathString::FromUTF8("fxb"));
 
-	mpt::fstream f(dlg.GetFirstFile().c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+	mpt::fstream f(dlg.GetFirstFile().AsNative().c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
 	if(f.good() && VSTPresets::SaveFile(f, *this, bank))
 	{
 		return true;
@@ -1636,7 +1636,7 @@
 bool CVstPlugin::LoadProgram()
 //----------------------------
 {
-	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	std::string defaultDir = TrackerDirectories::Instance().GetWorkingDirectory(DIR_PLUGINPRESETS).ToLocale();
 	bool useDefaultDir = !defaultDir.empty();
 	if(!useDefaultDir)
 	{
@@ -1650,17 +1650,17 @@
 		"VST Plugin Programs (*.fxp)|*.fxp|"
 		"VST Plugin Banks (*.fxb)|*.fxb|"
 		"All Files|*.*||")
-		.WorkingDirectory(defaultDir);
+		.WorkingDirectory(mpt::PathString::FromLocale(defaultDir));
 	if(!dlg.Show()) return false;
 
 	if(useDefaultDir)
 	{
-		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory().c_str(), DIR_PLUGINPRESETS, true);
+		TrackerDirectories::Instance().SetWorkingDirectory(dlg.GetWorkingDirectory(), DIR_PLUGINPRESETS, true);
 	}
 
 	CMappedFile f;
 	const char *errorStr = nullptr;
-	if(f.Open(dlg.GetFirstFile().c_str()))
+	if(f.Open(dlg.GetFirstFile().ToCString()))
 	{
 		FileReader file = f.GetFile();
 		errorStr = VSTPresets::GetErrorMessage(VSTPresets::LoadFile(file, *this));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.