From: <man...@us...> - 2013-12-03 14:22:32
|
Revision: 3355 http://sourceforge.net/p/modplug/code/3355 Author: manxorist Date: 2013-12-03 14:22:11 +0000 (Tue, 03 Dec 2013) Log Message: ----------- [Ref] libopenmpt: Split static and DLL builds into separate project files. [Ref] libopenmpt: Split test build into separate project file. Modified Paths: -------------- trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win32.cmd trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win64.cmd trunk/OpenMPT/libopenmpt/libopenmpt.sln trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln trunk/OpenMPT/openmpt123/openmpt123.sln Added Paths: ----------- trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj.filters trunk/OpenMPT/libopenmpt/libopenmpt_test.sln trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj trunk/OpenMPT/libopenmpt/libopenmpt_test.vcxproj.filters Removed Paths: ------------- trunk/OpenMPT/libopenmpt/svn_version/ Property Changed: ---------------- trunk/OpenMPT/libopenmpt/ Modified: trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd =================================================================== --- trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd 2013-12-03 14:22:11 UTC (rev 3355) @@ -6,7 +6,7 @@ cd bin || goto error -Win32\libopenmpt-test.exe || goto error +Win32\libopenmpt_test.exe || goto error cd .. || goto error Modified: trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd =================================================================== --- trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd 2013-12-03 14:22:11 UTC (rev 3355) @@ -6,7 +6,7 @@ cd bin || goto error -x64\libopenmpt-test.exe || goto error +x64\libopenmpt_test.exe || goto error cd .. || goto error Modified: trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win32.cmd =================================================================== --- trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win32.cmd 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win32.cmd 2013-12-03 14:22:11 UTC (rev 3355) @@ -22,8 +22,8 @@ xcopy /e /y /c ..\..\externals\*.* include cd libopenmpt || goto error - devenv libopenmpt.sln /clean "Test|Win32" || goto error - devenv libopenmpt.sln /build "Test|Win32" || goto error + devenv libopenmpt_test.sln /clean "Release|Win32" || goto error + devenv libopenmpt_test.sln /build "Release|Win32" || goto error cd .. || goto error Modified: trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win64.cmd =================================================================== --- trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win64.cmd 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/build/auto/vs2010_libopenmpt_test_win64.cmd 2013-12-03 14:22:11 UTC (rev 3355) @@ -22,8 +22,8 @@ xcopy /e /y /c ..\..\externals\*.* include cd libopenmpt || goto error - devenv libopenmpt.sln /clean "Test|x64" || goto error - devenv libopenmpt.sln /build "Test|x64" || goto error + devenv libopenmpt_test.sln /clean "Release|x64" || goto error + devenv libopenmpt_test.sln /build "Release|x64" || goto error cd .. || goto error Index: trunk/OpenMPT/libopenmpt =================================================================== --- trunk/OpenMPT/libopenmpt 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/libopenmpt 2013-12-03 14:22:11 UTC (rev 3355) Property changes on: trunk/OpenMPT/libopenmpt ___________________________________________________________________ Modified: svn:ignore ## -4,11 +4,13 ## Release ReleaseStatic Test +docs ipch libopenmpt.opensdf libopenmpt.sdf libopenmpt.suo libopenmpt.vcxproj.user +libopenmptDLL.vcxproj.user libopenmpt_foobar2000.opensdf libopenmpt_foobar2000.sdf libopenmpt_foobar2000.suo ## -16,5 +18,7 ## libopenmpt_settings-Debug libopenmpt_settings-Release libopenmpt_settings.vcxproj.user +libopenmpt_test.vcxproj.user x64 -docs +libopenmpt_test.sdf +libopenmpt_test.suo Modified: trunk/OpenMPT/libopenmpt/libopenmpt.sln =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.sln 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/libopenmpt/libopenmpt.sln 2013-12-03 14:22:11 UTC (rev 3355) @@ -8,14 +8,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_settings", "libopenmpt_settings.vcxproj", "{B2B6EE07-F662-496D-980C-FCA7CA144DBC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmptDLL", "libopenmptDLL.vcxproj", "{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Test|Win32 = Test|Win32 - Test|x64 = Test|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -26,19 +26,20 @@ {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.Build.0 = Release|Win32 {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.ActiveCfg = Release|x64 {812A654D-99BE-4D13-B97F-86332AD3E363}.Release|x64.Build.0 = Release|x64 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Test|Win32.ActiveCfg = Test|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Test|Win32.Build.0 = Test|Win32 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Test|x64.ActiveCfg = Test|x64 - {812A654D-99BE-4D13-B97F-86332AD3E363}.Test|x64.Build.0 = Test|x64 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|Win32.ActiveCfg = Debug|Win32 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|Win32.Build.0 = Debug|Win32 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Debug|x64.ActiveCfg = Debug|Win32 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|Win32.ActiveCfg = Release|Win32 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|Win32.Build.0 = Release|Win32 {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Release|x64.ActiveCfg = Release|Win32 - {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|Win32.ActiveCfg = Release|Win32 - {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|Win32.Build.0 = Release|Win32 - {B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|x64.ActiveCfg = Release|Win32 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|Win32.Build.0 = Debug|Win32 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|x64.ActiveCfg = Debug|x64 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Debug|x64.Build.0 = Debug|x64 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|Win32.ActiveCfg = Release|Win32 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|Win32.Build.0 = Release|Win32 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|x64.ActiveCfg = Release|x64 + {A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-12-03 14:22:11 UTC (rev 3355) @@ -1,14 +1,6 @@ <?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="DebugStatic|Win32"> - <Configuration>DebugStatic</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="DebugStatic|x64"> - <Configuration>DebugStatic</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> <Platform>Win32</Platform> @@ -17,14 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseStatic|Win32"> - <Configuration>ReleaseStatic</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="ReleaseStatic|x64"> - <Configuration>ReleaseStatic</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -33,14 +17,6 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Test|Win32"> - <Configuration>Test</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Test|x64"> - <Configuration>Test</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{812A654D-99BE-4D13-B97F-86332AD3E363}</ProjectGuid> @@ -48,196 +24,72 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>false</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>false</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <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)'=='DebugStatic|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)'=='DebugStatic|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Test|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)'=='Test|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)'=='ReleaseStatic|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)'=='ReleaseStatic|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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>..\bin\$(Platform)\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'"> - <OutDir>..\bin\$(Platform)\</OutDir> - <TargetName>$(ProjectName)-test</TargetName> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>..\bin\$(Platform)\</OutDir> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'"> - <OutDir>..\bin\$(Platform)\</OutDir> - <TargetName>$(ProjectName)-test</TargetName> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>..\bin\$(Platform)-Debug\</OutDir> + <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>..\bin\$(Platform)-Debug\</OutDir> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'"> <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"> - <OutDir>..\build\lib\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"> - <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <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> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <DelayLoadDLLs> - </DelayLoadDLLs> - </Link> - <PreBuildEvent> - <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> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <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> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <DelayLoadDLLs> - </DelayLoadDLLs> - </Link> - <PreBuildEvent> - <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> - </Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> @@ -245,17 +97,17 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <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> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> </PreBuildEvent> <Lib> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> </Lib> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> @@ -263,7 +115,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> <PreBuildEvent> - <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> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> </PreBuildEvent> <Lib> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> @@ -277,130 +129,8 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <MultiProcessorCompilation>true</MultiProcessorCompilation> <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <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> - <StringPooling>true</StringPooling> - <WholeProgramOptimization>false</WholeProgramOptimization> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <DelayLoadDLLs> - </DelayLoadDLLs> - </Link> - <PreBuildEvent> - <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\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\in_openmpt.dll -copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\xmp-openmpt.dll -copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll -</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <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> - <StringPooling>true</StringPooling> - <WholeProgramOptimization>false</WholeProgramOptimization> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <DelayLoadDLLs> - </DelayLoadDLLs> - <SubSystem>Console</SubSystem> - </Link> - <PreBuildEvent> - <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> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <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> - <StringPooling>true</StringPooling> - <WholeProgramOptimization>false</WholeProgramOptimization> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <DelayLoadDLLs> - </DelayLoadDLLs> - </Link> - <PreBuildEvent> - <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\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll -</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> - <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <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> - <StringPooling>true</StringPooling> - <WholeProgramOptimization>false</WholeProgramOptimization> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <DelayLoadDLLs> - </DelayLoadDLLs> - <SubSystem>Console</SubSystem> - </Link> - <PreBuildEvent> - <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> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Full</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <FloatingPointModel>Fast</FloatingPointModel> <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> @@ -412,13 +142,13 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <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> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> </PreBuildEvent> <Lib> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> </Lib> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Full</Optimization> @@ -427,7 +157,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation> <FloatingPointModel>Fast</FloatingPointModel> <PreprocessorDefinitions>LIBOPENMPT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..;../common;../libopenmpt/svn_version;../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> @@ -439,7 +169,7 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <PreBuildEvent> - <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> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> </PreBuildEvent> <Lib> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> @@ -466,8 +196,6 @@ <ClInclude Include="..\common\typedefs.h" /> <ClInclude Include="..\common\version.h" /> <ClInclude Include="..\common\versionNumber.h" /> - <ClInclude Include="..\include\pugixml\src\pugiconfig.hpp" /> - <ClInclude Include="..\include\pugixml\src\pugixml.hpp" /> <ClInclude Include="..\soundlib\AudioReadTarget.h" /> <ClInclude Include="..\soundlib\ChunkReader.h" /> <ClInclude Include="..\soundlib\Dither.h" /> @@ -516,8 +244,6 @@ <ClInclude Include="libopenmpt_impl.hpp" /> <ClInclude Include="libopenmpt_interactive.hpp" /> <ClInclude Include="libopenmpt_internal.h" /> - <ClInclude Include="libopenmpt_settings.h" /> - <ClInclude Include="libopenmpt_settings.hpp" /> <ClInclude Include="libopenmpt_stream_callbacks_fd.h" /> <ClInclude Include="libopenmpt_stream_callbacks_file.h" /> <ClInclude Include="libopenmpt_version.h" /> @@ -533,7 +259,6 @@ <ClCompile Include="..\common\typedefs.cpp" /> <ClCompile Include="..\common\version.cpp" /> <ClCompile Include="..\include\miniz\miniz.c" /> - <ClCompile Include="..\include\pugixml\src\pugixml.cpp" /> <ClCompile Include="..\soundlib\Dither.cpp" /> <ClCompile Include="..\soundlib\Dlsbank.cpp" /> <ClCompile Include="..\soundlib\Fastmix.cpp" /> @@ -605,45 +330,6 @@ <ClCompile Include="libopenmpt_cxx.cpp" /> <ClCompile Include="libopenmpt_impl.cpp" /> <ClCompile Include="libopenmpt_interactive.cpp" /> - <ClCompile Include="libopenmpt_modplug.c"> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsC</CompileAs> - <CompileAs Condition="'$(Configuration)|$(Platform)'=='Test|x64'">CompileAsC</CompileAs> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="libopenmpt_test.cpp" /> - <ClCompile Include="libopenmpt_winamp.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="libopenmpt_xmplay.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2013-12-02 18:04:41 UTC (rev 3354) +++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2013-12-03 14:22:11 UTC (rev 3355) @@ -27,12 +27,6 @@ <Filter Include="Source Files\test"> <UniqueIdentifier>{7e476eee-06d3-440e-89c1-29c78a21daa9}</UniqueIdentifier> </Filter> - <Filter Include="Header Files\pugixml"> - <UniqueIdentifier>{d18c2a3b-8a7c-43e4-b77f-b02eaead5d62}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\pugixml"> - <UniqueIdentifier>{c229b22b-065f-42fd-81ee-498a859a7c8d}</UniqueIdentifier> - </Filter> <Filter Include="Source Files\miniz"> <UniqueIdentifier>{3800b9bf-c28e-489f-8792-64b1b5a58b40}</UniqueIdentifier> </Filter> @@ -215,12 +209,6 @@ <ClInclude Include="..\common\Logging.h"> <Filter>Header Files\common</Filter> </ClInclude> - <ClInclude Include="..\include\pugixml\src\pugiconfig.hpp"> - <Filter>Header Files\pugixml</Filter> - </ClInclude> - <ClInclude Include="..\include\pugixml\src\pugixml.hpp"> - <Filter>Header Files\pugixml</Filter> - </ClInclude> <ClInclude Include="..\soundlib\S3MTools.h"> <Filter>Header Files\soundlib</Filter> </ClInclude> @@ -242,12 +230,6 @@ <ClInclude Include="..\soundlib\Tagging.h"> <Filter>Header Files\soundlib</Filter> </ClInclude> - <ClInclude Include="libopenmpt_settings.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="libopenmpt_settings.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="libopenmpt_stream_callbacks_fd.h"> <Filter>Header Files</Filter> </ClInclude> @@ -472,12 +454,6 @@ <ClCompile Include="..\common\version.cpp"> <Filter>Source Files\common</Filter> </ClCompile> - <ClCompile Include="libopenmpt_modplug.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="libopenmpt_winamp.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="libopenmpt_c.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -487,9 +463,6 @@ <ClCompile Include="libopenmpt_interactive.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="libopenmpt_xmplay.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\soundlib\Load_digi.cpp"> <Filter>Source Files\soundlib</Filter> </ClCompile> @@ -499,15 +472,9 @@ <ClCompile Include="libopenmpt_impl.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\include\pugixml\src\pugixml.cpp"> - <Filter>Source Files\pugixml</Filter> - </ClCompile> <ClCompile Include="..\soundlib\S3MTools.cpp"> <Filter>Source Files\soundlib</Filter> </ClCompile> - <ClCompile Include="libopenmpt_test.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\soundlib\Dither.cpp"> <Filter>Source Files\soundlib</Filter> </ClCompile> Added: trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj =================================================================== --- trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj (rev 0) +++ trunk/OpenMPT/libopenmpt/libopenmptDLL.vcxproj 2013-12-03 14:22:11 UTC (rev 3355) @@ -0,0 +1,373 @@ +<?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>{A1C5B6FA-F333-4999-8DF0-BE2F5FD4B882}</ProjectGuid> + <RootNamespace>libopenmptDLL</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <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 Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>..\bin\$(Platform)\</OutDir> + <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + <TargetName>libopenmpt</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>..\bin\$(Platform)\</OutDir> + <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + <TargetName>libopenmpt</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>..\bin\$(Platform)-Debug\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>..\bin\$(Platform)-Debug\</OutDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + <TargetName>libopenmpt</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IntDir>..\build\obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + <TargetName>libopenmpt</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../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> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <DelayLoadDLLs> + </DelayLoadDLLs> + </Link> + <PreBuildEvent> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../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> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <DelayLoadDLLs> + </DelayLoadDLLs> + </Link> + <PreBuildEvent> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Full</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <FloatingPointModel>Fast</FloatingPointModel> + <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <StringPooling>true</StringPooling> + <WholeProgramOptimization>false</WholeProgramOptimization> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <DelayLoadDLLs> + </DelayLoadDLLs> + </Link> + <PreBuildEvent> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> + </PreBuildEvent> + <PostBuildEvent> + <Command>copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\in_openmpt.dll +copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\xmp-openmpt.dll +copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll +</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Full</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <FloatingPointModel>Fast</FloatingPointModel> + <PreprocessorDefinitions>_WINDLL;LIBOPENMPT_BUILD;LIBOPENMPT_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..;../common;$(IntDir);../common/svn_version_default;../include;../include/modplug/include;../include/pugixml/src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <StringPooling>true</StringPooling> + <WholeProgramOptimization>false</WholeProgramOptimization> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <DelayLoadDLLs> + </DelayLoadDLLs> + </Link> + <PreBuildEvent> + <Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h $(IntDir)svn_version.h || del $(IntDir)svn_version.h || true</Command> + </PreBuildEvent> + <PostBuildEvent> + <Command>copy /y ..\bin\$(Platform)\libopenmpt.dll ..\bin\$(Platform)\libmodplug.dll +</Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\common\AudioCriticalSection.h" /> + <ClInclude Include="..\common\BuildSettings.h" /> + <ClInclude Include="..\common\CompilerDetect.h" /> + <ClInclude Include="..\common\FlagSet.h" /> + <ClInclude Include="..\common\Logging.h" /> + <ClInclude Include="..\common\misc_util.h" /> + <ClInclude Include="..\common\mptFstream.h" /> + <ClInclude Include="..\common\mptPathString.h" /> + <ClInclude Include="..\common\mptString.h" /> + <ClInclude Include="..\common\mutex.h" /> + <ClInclude Include="..\common\Profiler.h" /> + <ClInclude Include="..\common\serialization_utils.h" /> + <ClInclude Include="..\common\stdafx.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\thread.h" /> + <ClInclude Include="..\common\typedefs.h" /> + <ClInclude Include="..\common\version.h" /> + <ClInclude Include="..\common\versionNumber.h" /> + <ClInclude Include="..\include\pugixml\src\pugiconfig.hpp" /> + <ClInclude Include="..\include\pugixml\src\pugixml.hpp" /> + <ClInclude Include="..\soundlib\AudioReadTarget.h" /> + <ClInclude Include="..\soundlib\ChunkReader.h" /> + <ClInclude Include="..\soundlib\Dither.h" /> + <ClInclude Include="..\soundlib\Dlsbank.h" /> + <ClInclude Include="..\soundlib\Endianness.h" /> + <ClInclude Include="..\soundlib\FileReader.h" /> + <ClInclude Include="..\soundlib\ITCompression.h" /> + <ClInclude Include="..\soundlib\ITTools.h" /> + <ClInclude Include="..\soundlib\Loaders.h" /> + <ClInclude Include="..\soundlib\Message.h" /> + <ClInclude Include="..\soundlib\MIDIEvents.h" /> + <ClInclude Include="..\soundlib\MIDIMacros.h" /> + <ClInclude Include="..\soundlib\MixerLoops.h" /> + <ClInclude Include="..\soundlib\MixerSettings.h" /> + <ClInclude Include="..\soundlib\ModChannel.h" /> + <ClInclude Include="..\soundlib\modcommand.h" /> + <ClInclude Include="..\soundlib\ModInstrument.h" /> + <ClInclude Include="..\soundlib\ModSample.h" /> + <ClInclude Include="..\soundlib\ModSequence.h" /> + <ClInclude Include="..\soundlib\modsmp_ctrl.h" /> + <ClInclude Include="..\soundlib\mod_specifications.h" /> + <ClInclude Include="..\soundlib\pattern.h" /> + <ClInclude Include="..\soundlib\patternContainer.h" /> + <ClInclude Include="..\soundlib\Resampler.h" /> + <ClInclude Include="..\soundlib\RowVisitor.h" /> + <ClInclude Include="..\soundlib\S3MTools.h" /> + <ClInclude Include="..\soundlib\SampleFormat.h" /> + <ClInclude Include="..\soundlib\SampleFormatConverters.h" /> + <ClInclude Include="..\soundlib\SampleIO.h" /> + <ClInclude Include="..\soundlib\Sndfile.h" /> + <ClInclude Include="..\soundlib\Snd_defs.h" /> + <ClInclude Include="..\soundlib\SoundFilePlayConfig.h" /> + <ClInclude Include="..\soundlib\Tables.h" /> + <ClInclude Include="..\soundlib\Tagging.h" /> + <ClInclude Include="..\soundlib\tuning.h" /> + <ClInclude Include="..\soundlib\tuningbase.h" /> + <ClInclude Include="..\soundlib\tuningcollection.h" /> + <ClInclude Include="..\soundlib\Wav.h" /> + <ClInclude Include="..\soundlib\WAVTools.h" /> + <ClInclude Include="..\soundlib\WindowedFIR.h" /> + <ClInclude Include="..\soundlib\XMTools.h" /> + <ClInclude Include="..\test\test.h" /> + <ClInclude Include="libopenmpt.h" /> + <ClInclude Include="libopenmpt.hpp" /> + <ClInclude Include="libopenmpt_config.h" /> + <ClInclude Include="libopenmpt_impl.hpp" /> + <ClInclude Include="libopenmpt_interactive.hpp" /> + <ClInclude Include="libopenmpt_internal.h" /> + <ClInclude Include="libopenmpt_settings.h" /> + <ClInclude Include="libopenmpt_settings.hpp" /> + <ClInclude Include="libopenmpt_stream_callbacks_fd.h" /> + <ClInclude Include="libopenmpt_stream_callbacks_file.h" /> + <ClInclude Include="libopenmpt_version.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\common\AudioCriticalSection.cpp" /> + <ClCompile Include="..\common\misc_util.cpp" /> + <ClCompile Include="..\common\mptPathString.cpp" /> + <ClCompile Include="..\common\mptString.cpp" /> + <ClCompile Include="..\common\Profiler.cpp" /> + <ClCompile Include="..\common\serialization_utils.cpp" /> + <ClCompile Include="..\common\stdafx.cpp" /> + <ClCompile Include="..\common\typedefs.cpp" /> + <ClCompile Include="..\common\version.cpp" /> + <ClCompile Include="..\include\miniz\miniz.c" /> + <ClCompile Include="..\include\pugixml\src\pugixml.cpp" /> + <ClCompile Include="..\soundlib\Dither.cpp" /> + <ClCompile Include="..\soundlib\Dlsbank.cpp" /> + <ClCompile Include="..\soundlib\Fastmix.cpp" /> + <ClCompile Include="..\soundlib\ITCompression.cpp" /> + <ClCompile Include="..\soundlib\ITTools.cpp" /> + <ClCompile Include="..\soundlib\Load_669.cpp" /> + <ClCompile Include="..\soundlib\Load_amf.cpp" /> + <ClCompile Include="..\soundlib\Load_ams.cpp" /> + <ClCompile Include="..\soundlib\Load_dbm.cpp" /> + <ClCompile Include="..\soundlib\Load_digi.cpp" /> + <ClCompile Include="..\soundlib\Load_dmf.cpp" /> + <ClCompile Include="..\soundlib\Load_dsm.cpp" /> + <ClCompile Include="..\soundlib\Load_far.cpp" /> + <ClCompile Include="..\soundlib\Load_gdm.cpp" /> + <ClCompile Include="..\soundlib\Load_imf.cpp" /> + <ClCompile Include="..\soundlib\Load_it.cpp" /> + <ClCompile Include="..\soundlib\Load_itp.cpp" /> + <ClCompile Include="..\soundlib\load_j2b.cpp" /> + <ClCompile Include="..\soundlib\Load_mdl.cpp" /> + <ClCompile Include="..\soundlib\Load_med.cpp" /> + <ClCompile Include="..\soundlib\Load_mid.cpp" /> + <ClCompile Include="..\soundlib\Load_mo3.cpp" /> + <ClCompile Include="..\soundlib\Load_mod.cpp" /> + <ClCompile Include="..\soundlib\Load_mt2.cpp" /> + <ClCompile Include="..\soundlib\Load_mtm.cpp" /> + <ClCompile Include="..\soundlib\Load_okt.cpp" /> + <ClCompile Include="..\soundlib\Load_psm.cpp" /> + <ClCompile Include="..\soundlib\Load_ptm.cpp" /> + <ClCompile Include="..\soundlib\Load_s3m.cpp" /> + <ClCompile Include="..\soundlib\Load_stm.cpp" /> + <ClCompile Include="..\soundlib\Load_ult.cpp" /> + <ClCompile Include="..\soundlib\Load_umx.cpp" /> + <ClCompile Include="..\soundlib\Load_wav.cpp" /> + <ClCompile Include="..\soundlib\Load_xm.cpp" /> + <ClCompile Include="..\soundlib\Message.cpp" /> + <ClCompile Include="..\soundlib\MIDIEvents.cpp" /> + <ClCompile Include="..\soundlib\MIDIMacros.cpp" /> + <ClCompile Include="..\soundlib\MixerLoops.cpp" /> + <ClCompile Include="..\soundlib\MixerSettings.cpp" /> + <ClCompile Include="..\soundlib\Mmcmp.cpp" /> + <ClCompile Include="..\soundlib\ModChannel.cpp" /> + <ClCompile Include="..\soundlib\modcommand.cpp" /> + <ClCompile Include="..\soundlib\ModInstrument.cpp" /> + <ClCompile Include="..\soundlib... [truncated message content] |