Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2427] trunk/OpenMPT
|
From: <man...@us...> - 2013-06-28 11:10:37
|
Revision: 2427
http://sourceforge.net/p/modplug/code/2427
Author: manxorist
Date: 2013-06-28 11:10:29 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
[New] Add .flac output support to openmpt123 on windows.
Modified Paths:
--------------
trunk/OpenMPT/include/flac/OpenMPT.txt
trunk/OpenMPT/include/flac/src/libFLAC/bitreader.c
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj
trunk/OpenMPT/openmpt123/openmpt123.sln
trunk/OpenMPT/openmpt123/openmpt123.vcxproj
trunk/OpenMPT/openmpt123/openmpt123_config.hpp
Property Changed:
----------------
trunk/OpenMPT/include/flac/src/libFLAC/
Modified: trunk/OpenMPT/include/flac/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/flac/OpenMPT.txt 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/include/flac/OpenMPT.txt 2013-06-28 11:10:29 UTC (rev 2427)
@@ -13,4 +13,8 @@
- 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)
\ No newline at end of file
+ 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.
Index: trunk/OpenMPT/include/flac/src/libFLAC
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/include/flac/src/libFLAC 2013-06-28 11:10:29 UTC (rev 2427)
Property changes on: trunk/OpenMPT/include/flac/src/libFLAC
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,5 ##
*.user
+Debug64_static
Debug_static
+Release64_static
Release_static
Modified: trunk/OpenMPT/include/flac/src/libFLAC/bitreader.c
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/bitreader.c 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/include/flac/src/libFLAC/bitreader.c 2013-06-28 11:10:29 UTC (rev 2427)
@@ -156,6 +156,7 @@
x = ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
return (x>>16) | (x<<16);
}
+#if defined(_M_IX86)
static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
{
__asm {
@@ -173,7 +174,16 @@
done1:
}
}
+#else
+static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
+{
+ while(len--) {
+ *start = local_swap32_(*start);
+ start++;
+ }
+}
#endif
+#endif
static FLaC__INLINE void crc16_update_word_(FLAC__BitReader *br, brword word)
{
Modified: trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2013-06-28 11:10:29 UTC (rev 2427)
@@ -5,10 +5,18 @@
<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>{4cefbc84-c215-11db-8314-0800200c9a66}</ProjectGuid>
@@ -21,25 +29,42 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ </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)'=='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|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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug_static\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug64_static\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release_static\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release64_static\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -60,6 +85,24 @@
<OutputFile>..\..\lib\libFLAC_staticd.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>.\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;VERSION="1.2.0";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <DisableSpecificWarnings>4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\..\lib\libFLAC64_staticd.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -83,6 +126,29 @@
<OutputFile>..\..\lib\libFLAC_static.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <OmitFramePointers>true</OmitFramePointers>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <AdditionalIncludeDirectories>.\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;VERSION="1.2.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <DisableSpecificWarnings>4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\..\lib\libFLAC64_static.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="include\protected\all.h" />
<ClInclude Include="include\private\all.h" />
Modified: trunk/OpenMPT/openmpt123/openmpt123.sln
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.sln 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/openmpt123/openmpt123.sln 2013-06-28 11:10:29 UTC (rev 2427)
@@ -9,6 +9,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\include\zlib\contrib\vstudio\vc10\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_static", "..\include\flac\src\libFLAC\libFLAC_static_10.vcxproj", "{4CEFBC84-C215-11DB-8314-0800200C9A66}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -49,6 +51,14 @@
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = ReleaseWithoutAsm|x64
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64
+ {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/OpenMPT/openmpt123/openmpt123.vcxproj
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.vcxproj 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/openmpt123/openmpt123.vcxproj 2013-06-28 11:10:29 UTC (rev 2427)
@@ -72,7 +72,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include/flac/include;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -84,7 +84,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;../common;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include/flac/include;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -99,7 +99,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FloatingPointModel>Fast</FloatingPointModel>
- <AdditionalIncludeDirectories>..;../common;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include/flac/include;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -119,7 +119,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FloatingPointModel>Fast</FloatingPointModel>
- <AdditionalIncludeDirectories>..;../common;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;../common;../include/flac/include;../include/portaudio/include;../common/svn_version;../common/svn_version_default</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -136,6 +136,9 @@
<ClCompile Include="openmpt123.cpp" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\include\flac\src\libFLAC\libFLAC_static_10.vcxproj">
+ <Project>{4cefbc84-c215-11db-8314-0800200c9a66}</Project>
+ </ProjectReference>
<ProjectReference Include="..\include\portaudio\build\msvc\portaudio_openmpt_vs2010.vcxproj">
<Project>{0a18a071-125e-442f-aff7-a3f68abecf99}</Project>
</ProjectReference>
Modified: trunk/OpenMPT/openmpt123/openmpt123_config.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_config.hpp 2013-06-28 10:37:59 UTC (rev 2426)
+++ trunk/OpenMPT/openmpt123/openmpt123_config.hpp 2013-06-28 11:10:29 UTC (rev 2427)
@@ -14,9 +14,12 @@
#pragma warning( disable : 4996 ) // 'foo': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _foo. See online help for details.
+#define MPT_WITH_FLAC
#define MPT_WITH_PORTAUDIO
#define MPT_WITH_ZLIB
+#define FLAC__NO_DLL
+
#endif // _MSC_VER
#ifndef LIBOPENMPT_ALPHA_WARNING_SEEN_AND_I_KNOW_WHAT_I_AM_DOING
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
