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

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

Revision: 2642
          http://sourceforge.net/p/modplug/code/2642
Author:   manxorist
Date:     2013-09-06 15:22:10 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Merged revision(s) 2606, 2609-2610, 2614, 2616, 2621, 2624, 2641 from branches/manx/premake:
[Ref] Replace all project files for external libraries in include/ with project files which are generated via premake4. Add corresponding premake4 files. Adopt mptrack and libopenmpt project and solution files for VS2010 to new project files. This also adds 64bit project configurations for all VS2010 external projects. Each library is built in 3 versions, Debug,Release,Normal. Debug and Release correspond to the standard VS build configurations. Normal is the same as Release, but with link time code generation disabled for increased build speeds. VS2008 projects are broken with the premake conversion - they will be fixed later.
........
[Ref] Convert VS2008 mptrack solution to premake4-generated library project files.
........
[Fix] Work-around premake quote escaping stupidity.
........
[Ref] libopenmpt: Support compiling without including windows.h on Windows (when MO3 support is disabled which would require LoadLibrary()).
........
[Ref] Add portmidi 217 sourcecode.
[Ref] Add premake4 project file for portmidi.
[Ref] Build midi i/o plugin with premake4 portmidi project.
[Ref] Add midi i/o plugin to VS2010 mptrack solution.
[Ref] Remove MIDI Tools.sln.
[Fix] Fix compilation of MidiInOut.h .
........
[Ref] libopenmpt: Silence linker warnings by setting /LTCG and using release-build external libraries.
[Ref] openmtp123: Silence linker warnings by setting /LTCG and using release-build external libraries.
........
[Ref] Silence a warning in portaudio code.
........
[Fix] Fix debug build of midi i/o plugin.
........

Modified Paths:
--------------
    trunk/OpenMPT/common/BuildSettings.h
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/include/flac/OpenMPT.txt
    trunk/OpenMPT/include/lhasa/OpenMPT.txt
    trunk/OpenMPT/include/lhasa/lhasa.vcproj
    trunk/OpenMPT/include/lhasa/lhasa.vcxproj
    trunk/OpenMPT/include/lhasa/lhasa.vcxproj.filters
    trunk/OpenMPT/include/portaudio/OpenMPT.txt
    trunk/OpenMPT/include/readme.txt
    trunk/OpenMPT/include/soundtouch/OpenMPT.txt
    trunk/OpenMPT/include/soundtouch/soundtouch.vcproj
    trunk/OpenMPT/libopenmpt/libopenmpt.sln
    trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
    trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln
    trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.vcxproj
    trunk/OpenMPT/mptrack/MPTRACK_08.sln
    trunk/OpenMPT/mptrack/MPTRACK_10.sln
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/mptrack_08.vcproj
    trunk/OpenMPT/mptrack/mptrack_10.vcxproj
    trunk/OpenMPT/openmpt123/openmpt123.sln
    trunk/OpenMPT/openmpt123/openmpt123.vcxproj
    trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h
    trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
    trunk/OpenMPT/soundlib/load_j2b.cpp
    trunk/OpenMPT/unarchiver/ungzip.cpp
    trunk/OpenMPT/unarchiver/unzip.cpp

Added Paths:
-----------
    trunk/OpenMPT/include/flac/flac.vcproj
    trunk/OpenMPT/include/flac/flac.vcxproj
    trunk/OpenMPT/include/flac/flac.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/ALL_BUILD.vcproj
    trunk/OpenMPT/include/portmidi/CHANGELOG.txt
    trunk/OpenMPT/include/portmidi/CMakeLists.txt
    trunk/OpenMPT/include/portmidi/Doxyfile
    trunk/OpenMPT/include/portmidi/README.txt
    trunk/OpenMPT/include/portmidi/ZERO_CHECK.vcproj
    trunk/OpenMPT/include/portmidi/license.txt
    trunk/OpenMPT/include/portmidi/pm_cl/
    trunk/OpenMPT/include/portmidi/pm_common/
    trunk/OpenMPT/include/portmidi/pm_csharp/
    trunk/OpenMPT/include/portmidi/pm_dylib/
    trunk/OpenMPT/include/portmidi/pm_java/
    trunk/OpenMPT/include/portmidi/pm_linux/
    trunk/OpenMPT/include/portmidi/pm_mac/
    trunk/OpenMPT/include/portmidi/pm_mingw/
    trunk/OpenMPT/include/portmidi/pm_python/
    trunk/OpenMPT/include/portmidi/pm_qt/
    trunk/OpenMPT/include/portmidi/pm_test/
    trunk/OpenMPT/include/portmidi/pm_win/
    trunk/OpenMPT/include/portmidi/portmidi.sln
    trunk/OpenMPT/include/portmidi/portmidi.vcproj
    trunk/OpenMPT/include/portmidi/portmidi.vcxproj
    trunk/OpenMPT/include/portmidi/portmidi.vcxproj.filters
    trunk/OpenMPT/include/portmidi/portmidi_cdt.zip
    trunk/OpenMPT/include/portmidi/portmusic_logo.png
    trunk/OpenMPT/include/portmidi/porttime/
    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/smbPitchShift/smbPitchShift.vcxproj.filters
    trunk/OpenMPT/include/soundtouch/soundtouch.vcxproj
    trunk/OpenMPT/include/soundtouch/soundtouch.vcxproj.filters
    trunk/OpenMPT/include/update_premake4_projects.cmd
    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

Removed Paths:
-------------
    trunk/OpenMPT/include/smbPitchShift/xsoundlib_08.vcproj
    trunk/OpenMPT/include/smbPitchShift/xsoundlib_10.vcxproj
    trunk/OpenMPT/include/smbPitchShift/xsoundlib_10.vcxproj.filters
    trunk/OpenMPT/include/soundtouch/soundtouch_08.vcproj
    trunk/OpenMPT/include/soundtouch/soundtouch_10.vcxproj
    trunk/OpenMPT/include/soundtouch/soundtouch_10.vcxproj.filters
    trunk/OpenMPT/plugins/MIDI Tools.sln

Property Changed:
----------------
    trunk/OpenMPT/
    trunk/OpenMPT/include/
    trunk/OpenMPT/include/flac/
    trunk/OpenMPT/include/lhasa/
    trunk/OpenMPT/include/portaudio/
    trunk/OpenMPT/include/portmidi/
    trunk/OpenMPT/include/smbPitchShift/
    trunk/OpenMPT/include/soundtouch/
    trunk/OpenMPT/include/zlib/

Index: trunk/OpenMPT
===================================================================
--- trunk/OpenMPT	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT	2013-09-06 15:22:10 UTC (rev 2642)

Property changes on: trunk/OpenMPT
___________________________________________________________________
Modified: svn:mergeinfo
## -4,6 +4,7 ##
 /branches/manx/instrument-fields-fixes:2203-2238
 /branches/manx/mptstring-stdstring-support:2204,2208,2212,2214,2217,2220,2224,2259,2261-2262,2264,2267
 /branches/manx/nonglobal-mixer:1715-1841
+/branches/manx/premake:2606,2609-2610,2614,2616,2621,2624,2641
 /branches/manx/profiler:1813
 /branches/manx/project-files-cleanups:1378-1382
 /branches/manx/sampleformat-ref:2554-2582
\ No newline at end of property
Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/common/BuildSettings.h	2013-09-06 15:22:10 UTC (rev 2642)
@@ -174,6 +174,11 @@
 
 // fixing stuff up
 
+#if !defined(MODPLUG_TRACKER) && defined(NO_MO3)
+// For library builds, windows.h is only required for LoadLibrary,
+#define NO_WINDOWS_H
+#endif
+
 #if !defined(ENABLE_MMX) && !defined(NO_REVERB)
 #define NO_REVERB // reverb requires mmx
 #endif

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/common/typedefs.h	2013-09-06 15:22:10 UTC (rev 2642)
@@ -271,7 +271,7 @@
 
 
 
-#if defined(_WIN32)
+#if !defined(NO_WINDOWS_H)
 
 #ifndef NOMINMAX
 #define NOMINMAX

Index: trunk/OpenMPT/include
===================================================================
--- trunk/OpenMPT/include	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include	2013-09-06 15:22:10 UTC (rev 2642)

Property changes on: trunk/OpenMPT/include
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,7 ##
+*.sdf
+*.suo
+bin
+include.sln
+includeDLL.sln
+ipch
+premake4.exe
Added: svn:global-ignores
## -0,0 +1 ##
+premake4.exe
Index: trunk/OpenMPT/include/flac
===================================================================
--- trunk/OpenMPT/include/flac	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include/flac	2013-09-06 15:22:10 UTC (rev 2642)

Property changes on: trunk/OpenMPT/include/flac
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+*.user
+obj
Added: svn:global-ignores
## -0,0 +1 ##
+obj
Modified: trunk/OpenMPT/include/flac/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/flac/OpenMPT.txt	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include/flac/OpenMPT.txt	2013-09-06 15:22:10 UTC (rev 2642)
@@ -1,20 +1,5 @@
 The FLAC package has been left pretty much untouched, except for a few changes:
 - Obviously, unnecessary folders and files (documentation, makefiles, etc.) have
   been removed.
-- The existing libFLAC_static project files have been upgraded to VS2008 and
-  VS2010. The following changes have been made:
-  - Output directory for the library has been changed to ..\..\lib\
-  - Output filename has been changed to ..\..\lib\libFLAC_staticd.lib (debug)
-    and ..\..\lib\libFLAC_static.lib (release). 
-  - ASM files and nasm.h have been excluded from the project to be able to
-    compile without NASM.
-  - *ogg*.c/h files have been excluded from the project to be able to compile
-    without libvorbis.
-  - The following preprocessor directives have been removed from both debug
-    and release configurations: FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM
-  - Debug configurations have been changed to use a multi-threaded debug DLL
-    runtime library (/MDd)
-  - x64 project configurations have been added for VS2010.
-    These are based on the modified x86 ones, which output filesnames and
-    directories suffixed by '64'. FLAC__USE_3DNOW is removed for x64.
-  - A c implementation for local_swap32_block_ if !_M_IX86 has been added.
+- For building, premake4 is used to generate Visual Studio project files.
+  See ../premake4.lua for details.

Copied: trunk/OpenMPT/include/flac/flac.vcproj (from rev 2606, branches/manx/premake/include/flac/flac.vcproj)
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcproj	                        (rev 0)
+++ trunk/OpenMPT/include/flac/flac.vcproj	2013-09-06 15:22:10 UTC (rev 2642)
@@ -0,0 +1,708 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="flac"
+	ProjectGUID="{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}"
+	RootNamespace="flac"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="DebugLib|Win32"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x32\DebugLib"
+			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;src\libFLAC\include"
+				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;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)\flac.pdb"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac.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="DebugLib|x64"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x64\DebugLib"
+			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;src\libFLAC\include"
+				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;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)\flac64.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\&quot;1.2.1\&quot;;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac64.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|Win32"
+			OutputDirectory="..\bin\NormalLib"
+			IntermediateDirectory="obj\x32\NormalLib"
+			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;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"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				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"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac.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="include;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"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				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"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac64.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="3"
+				AdditionalIncludeDirectories="include;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"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\flac.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				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"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac.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|x64"
+			OutputDirectory="..\bin\ReleaseLib"
+			IntermediateDirectory="obj\x64\ReleaseLib"
+			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;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"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				ProgramDataBaseFileName="$(OutDir)\flac64.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				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"
+				AdditionalIncludeDirectories="include;src\libFLAC\include"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\flac64.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="src"
+			Filter=""
+			>
+			<Filter
+				Name="libFLAC"
+				Filter=""
+				>
+				<Filter
+					Name="include"
+					Filter=""
+					>
+					<Filter
+						Name="private"
+						Filter=""
+						>
+						<File
+							RelativePath="src\libFLAC\include\private\all.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\bitmath.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\bitreader.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\bitwriter.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\cpu.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\crc.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\fixed.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\float.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\format.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\lpc.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\md5.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\memory.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\metadata.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\stream_encoder_framing.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\private\window.h"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="protected"
+						Filter=""
+						>
+						<File
+							RelativePath="src\libFLAC\include\protected\all.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\protected\stream_decoder.h"
+							>
+						</File>
+						<File
+							RelativePath="src\libFLAC\include\protected\stream_encoder.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<File
+					RelativePath="src\libFLAC\bitmath.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\bitreader.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\bitwriter.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\cpu.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\crc.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\fixed.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\float.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\format.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\lpc.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\md5.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\memory.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\metadata_iterators.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\metadata_object.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\stream_decoder.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\stream_encoder.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\stream_encoder_framing.c"
+					>
+				</File>
+				<File
+					RelativePath="src\libFLAC\window.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="include"
+			Filter=""
+			>
+			<Filter
+				Name="FLAC"
+				Filter=""
+				>
+				<File
+					RelativePath="include\FLAC\all.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\assert.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\callback.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\export.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\format.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\metadata.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\ordinals.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\stream_decoder.h"
+					>
+				</File>
+				<File
+					RelativePath="include\FLAC\stream_encoder.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Copied: trunk/OpenMPT/include/flac/flac.vcxproj (from rev 2606, branches/manx/premake/include/flac/flac.vcxproj)
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcxproj	                        (rev 0)
+++ trunk/OpenMPT/include/flac/flac.vcxproj	2013-09-06 15:22:10 UTC (rev 2642)
@@ -0,0 +1,358 @@
+<?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>
+			<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>{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}</ProjectGuid>
+		<RootNamespace>flac</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'">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>
+	</PropertyGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|Win32'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;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>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugLib|x64'">
+		<ClCompile>
+			<Optimization>Disabled</Optimization>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;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>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<PreprocessorDefinitions>FLAC__NO_DLL;VERSION=&quot;1.2.1&quot;;DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>include;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>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<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>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NormalLib|x64'">
+		<ClCompile>
+			<AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>include;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>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<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>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|Win32'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>include;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>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<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>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLib|x64'">
+		<ClCompile>
+			<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+			<Optimization>Full</Optimization>
+			<AdditionalIncludeDirectories>include;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>
+			<MinimalRebuild>false</MinimalRebuild>
+			<StringPooling>true</StringPooling>
+			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+			<FunctionLevelLinking>true</FunctionLevelLinking>
+			<PrecompiledHeader></PrecompiledHeader>
+			<WarningLevel>Level3</WarningLevel>
+			<FloatingPointModel>Fast</FloatingPointModel>
+			<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+			<CompileAs>CompileAsC</CompileAs>
+		</ClCompile>
+		<ResourceCompile>
+			<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>
+			<AdditionalIncludeDirectories>include;src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+		</ResourceCompile>
+	<Lib>
+		<OutputFile>$(OutDir)flac64.lib</OutputFile>
+	</Lib>
+		<Link>
+			<SubSystem>Windows</SubSystem>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
+			<OptimizeReferences>true</OptimizeReferences>
+			<EnableCOMDATFolding>true</EnableCOMDATFolding>
+			<ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName>
+		</Link>
+	</ItemDefinitionGroup>
+	<ItemGroup>
+		<ClInclude Include="src\libFLAC\include\private\all.h" />
+		<ClInclude Include="src\libFLAC\include\private\bitmath.h" />
+		<ClInclude Include="src\libFLAC\include\private\bitreader.h" />
+		<ClInclude Include="src\libFLAC\include\private\bitwriter.h" />
+		<ClInclude Include="src\libFLAC\include\private\cpu.h" />
+		<ClInclude Include="src\libFLAC\include\private\crc.h" />
+		<ClInclude Include="src\libFLAC\include\private\fixed.h" />
+		<ClInclude Include="src\libFLAC\include\private\float.h" />
+		<ClInclude Include="src\libFLAC\include\private\format.h" />
+		<ClInclude Include="src\libFLAC\include\private\lpc.h" />
+		<ClInclude Include="src\libFLAC\include\private\md5.h" />
+		<ClInclude Include="src\libFLAC\include\private\memory.h" />
+		<ClInclude Include="src\libFLAC\include\private\metadata.h" />
+		<ClInclude Include="src\libFLAC\include\private\stream_encoder_framing.h" />
+		<ClInclude Include="src\libFLAC\include\private\window.h" />
+		<ClInclude Include="src\libFLAC\include\protected\all.h" />
+		<ClInclude Include="src\libFLAC\include\protected\stream_decoder.h" />
+		<ClInclude Include="src\libFLAC\include\protected\stream_encoder.h" />
+		<ClInclude Include="include\FLAC\all.h" />
+		<ClInclude Include="include\FLAC\assert.h" />
+		<ClInclude Include="include\FLAC\callback.h" />
+		<ClInclude Include="include\FLAC\export.h" />
+		<ClInclude Include="include\FLAC\format.h" />
+		<ClInclude Include="include\FLAC\metadata.h" />
+		<ClInclude Include="include\FLAC\ordinals.h" />
+		<ClInclude Include="include\FLAC\stream_decoder.h" />
+		<ClInclude Include="include\FLAC\stream_encoder.h" />
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="src\libFLAC\bitmath.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\bitreader.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\bitwriter.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\cpu.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\crc.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\fixed.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\float.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\format.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\lpc.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\md5.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\memory.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\metadata_iterators.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\metadata_object.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_decoder.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_encoder.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_encoder_framing.c">
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\window.c">
+		</ClCompile>
+	</ItemGroup>
+	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+	<ImportGroup Label="ExtensionTargets">
+	</ImportGroup>
+</Project>

Copied: trunk/OpenMPT/include/flac/flac.vcxproj.filters (from rev 2606, branches/manx/premake/include/flac/flac.vcxproj.filters)
===================================================================
--- trunk/OpenMPT/include/flac/flac.vcxproj.filters	                        (rev 0)
+++ trunk/OpenMPT/include/flac/flac.vcxproj.filters	2013-09-06 15:22:10 UTC (rev 2642)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<ItemGroup>
+		<Filter Include="src">
+			<UniqueIdentifier>{BBF2D14A-8E59-A544-9020-5934856C6448}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\libFLAC">
+			<UniqueIdentifier>{D099BA2E-71AE-E749-9790-2E15124CFA84}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\libFLAC\include">
+			<UniqueIdentifier>{7BAE1380-58B5-F84A-84D3-435738E5A493}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\libFLAC\include\private">
+			<UniqueIdentifier>{CD4927A6-4150-534C-A102-B7BEA298EB87}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\libFLAC\include\protected">
+			<UniqueIdentifier>{404C67D4-91D9-DD40-A9CA-655744FEB544}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include">
+			<UniqueIdentifier>{D0B2E3C1-5592-6F4B-A6C8-B76AFC874957}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="include\FLAC">
+			<UniqueIdentifier>{EA0AFA08-1C54-3A49-B735-1CB0686E3C39}</UniqueIdentifier>
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="src\libFLAC\include\private\all.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\bitmath.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\bitreader.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\bitwriter.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\cpu.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\crc.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\fixed.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\float.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\format.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\lpc.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\md5.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\memory.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\metadata.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\stream_encoder_framing.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\private\window.h">
+			<Filter>src\libFLAC\include\private</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\protected\all.h">
+			<Filter>src\libFLAC\include\protected</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\protected\stream_decoder.h">
+			<Filter>src\libFLAC\include\protected</Filter>
+		</ClInclude>
+		<ClInclude Include="src\libFLAC\include\protected\stream_encoder.h">
+			<Filter>src\libFLAC\include\protected</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\all.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\assert.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\callback.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\export.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\format.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\metadata.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\ordinals.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\stream_decoder.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+		<ClInclude Include="include\FLAC\stream_encoder.h">
+			<Filter>include\FLAC</Filter>
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="src\libFLAC\bitmath.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\bitreader.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\bitwriter.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\cpu.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\crc.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\fixed.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\float.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\format.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\lpc.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\md5.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\memory.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\metadata_iterators.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\metadata_object.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_decoder.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_encoder.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\stream_encoder_framing.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+		<ClCompile Include="src\libFLAC\window.c">
+			<Filter>src\libFLAC</Filter>
+		</ClCompile>
+	</ItemGroup>
+</Project>

Index: trunk/OpenMPT/include/lhasa
===================================================================
--- trunk/OpenMPT/include/lhasa	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include/lhasa	2013-09-06 15:22:10 UTC (rev 2642)

Property changes on: trunk/OpenMPT/include/lhasa
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
 Debug
 Release
 lhasa.vcxproj.user
+obj
Added: svn:global-ignores
## -0,0 +1 ##
+obj
Modified: trunk/OpenMPT/include/lhasa/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/lhasa/OpenMPT.txt	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include/lhasa/OpenMPT.txt	2013-09-06 15:22:10 UTC (rev 2642)
@@ -1,2 +1,4 @@
 lhasa LHA decompression library from https://github.com/fragglet/lhasa commit 13b44ac7859aad2f2b4fa76600c186f9f7f98c63 as of 2013-06-16.
 No local changes made.
+For building, premake4 is used to generate Visual Studio project files.
+See ../premake4.lua for details.

Modified: trunk/OpenMPT/include/lhasa/lhasa.vcproj
===================================================================
--- trunk/OpenMPT/include/lhasa/lhasa.vcproj	2013-09-06 14:16:11 UTC (rev 2641)
+++ trunk/OpenMPT/include/lhasa/lhasa.vcproj	2013-09-06 15:22:10 UTC (rev 2642)
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="lhasa"
-	ProjectGUID="{3960775B-D852-4974-903D-573E54FF565D}"
+	ProjectGUID="{6B11F6A8-B131-4D2B-80EF-5731A9016436}"
 	RootNamespace="lhasa"
-	TargetFrameworkVersion="196613"
+	Keyword="Win32Proj"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="DebugLib|Win32"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x32\DebugLib"
 			ConfigurationType="4"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,29 +43,40 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\msinttypes\stdint;..\msinttypes\inttypes"
+				AdditionalIncludeDirectories="..\msinttypes\inttypes;..\msinttypes\stdint"
+				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)\lhasa.pdb"
 				DebugInformationFormat="4"
+				CompileAs="1"
 			/>
 			<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="..\msinttypes\inttypes;..\msinttypes\stdint"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\lhasa.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -72,16 +86,21 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="DebugLib|x64"
+			OutputDirectory="..\bin\DebugLib"
+			IntermediateDirectory="obj\x64\DebugLib"
 			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -97,33 +116,123 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\msinttypes\stdint;..\msinttypes\inttypes"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\msinttypes\inttypes;..\msinttypes\stdint"
+				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)\lhasa64.pdb"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<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="..\msinttypes\inttypes;..\msinttypes\stdint"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\lhasa64.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|Win32"
+			OutputDirectory="..\bin\NormalLib"
+			IntermediateDirectory="obj\x32\NormalLib"
+			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="..\msinttypes\inttypes;..\msinttypes\stdint"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionL...
 
[truncated message content]