From: <man...@us...> - 2013-03-17 14:06:08
|
Revision: 1590 http://sourceforge.net/p/modplug/code/1590 Author: manxorist Date: 2013-03-17 14:05:53 +0000 (Sun, 17 Mar 2013) Log Message: ----------- Merged revision(s) 1586-1589 from branches/manx/build-speedup: [Var] Add a seperate project configuration "ReleaseLTCG" for MSVC2010 with Link Time Code Generation and disable LTCG in the default "Release" configuration. This results in faster full rebuilds and especially considerably faster rebuilds when only a few files were changed at the cost of missing full program optimizations. ........ [Var] Fix PCH path in ReleaseLTCG build configuration. ........ [Fix] Rename output file in "Release" configuration to mptrack-noLTCG.exe instead of mptrack.exe to not confuse VisualStudio when switching between configurations. ........ [Var] Rename solution configuration Release to ReleaseNoLTCG and rename ReleaseLTCG to Release so that nothing changes when using "Release" configuration. ........ Modified Paths: -------------- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj trunk/OpenMPT/include/zlib/contrib/vstudio/vc10/zlibstat.vcxproj trunk/OpenMPT/mptrack/MPTRACK_10.sln trunk/OpenMPT/mptrack/mptrack_10.vcxproj trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj trunk/OpenMPT/ungzip/ungzip_10.vcxproj trunk/OpenMPT/unlha/unlha_10.vcxproj trunk/OpenMPT/unrar/unrar_10.vcxproj trunk/OpenMPT/unzip/unzip_10.vcxproj trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj Property Changed: ---------------- trunk/OpenMPT/ trunk/OpenMPT/mptrack/ Index: trunk/OpenMPT =================================================================== --- trunk/OpenMPT 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT 2013-03-17 14:05:53 UTC (rev 1590) Property changes on: trunk/OpenMPT ___________________________________________________________________ Modified: svn:mergeinfo ## -1,2 +1,3 ## +/branches/manx/build-speedup:1586-1589 /branches/manx/header-dependencies-cleanups:1394-1397,1401-1402,1405-1406 /branches/manx/project-files-cleanups:1378-1382 \ No newline at end of property Modified: trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj =================================================================== --- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -19,6 +19,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -64,7 +65,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> - <WholeProgramOptimization>true</WholeProgramOptimization> + <WholeProgramOptimization>false</WholeProgramOptimization> <AdditionalIncludeDirectories>.\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;FLAC__USE_3DNOW;VERSION="1.2.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -75,6 +76,8 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Lib> <OutputFile>..\..\lib\libFLAC_static.lib</OutputFile> Modified: trunk/OpenMPT/include/zlib/contrib/vstudio/vc10/zlibstat.vcxproj =================================================================== --- trunk/OpenMPT/include/zlib/contrib/vstudio/vc10/zlibstat.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/include/zlib/contrib/vstudio/vc10/zlibstat.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -49,6 +49,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -199,6 +200,7 @@ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <ResourceCompile> <Culture>0x040c</Culture> Index: trunk/OpenMPT/mptrack =================================================================== --- trunk/OpenMPT/mptrack 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/mptrack 2013-03-17 14:05:53 UTC (rev 1590) Property changes on: trunk/OpenMPT/mptrack ___________________________________________________________________ Modified: svn:ignore ## -4,4 +4,5 ## *.user Debug Release +ReleaseLTCG ipch Modified: trunk/OpenMPT/mptrack/MPTRACK_10.sln =================================================================== --- trunk/OpenMPT/mptrack/MPTRACK_10.sln 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/mptrack/MPTRACK_10.sln 2013-03-17 14:05:53 UTC (rev 1590) @@ -25,44 +25,63 @@ GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 + ReleaseNoLTCG|Win32 = ReleaseNoLTCG|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.ActiveCfg = Debug|Win32 {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Debug|Win32.Build.0 = Debug|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.ActiveCfg = Release|Win32 - {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.Build.0 = Release|Win32 + {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.ActiveCfg = ReleaseLTCG|Win32 + {21D95071-FB97-4E69-B3B1-050D0D4A5021}.Release|Win32.Build.0 = ReleaseLTCG|Win32 + {21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {21D95071-FB97-4E69-B3B1-050D0D4A5021}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Debug|Win32.ActiveCfg = Debug|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Debug|Win32.Build.0 = Debug|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Release|Win32.ActiveCfg = Release|Win32 {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.Release|Win32.Build.0 = Release|Win32 + {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Debug|Win32.ActiveCfg = Debug|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Debug|Win32.Build.0 = Debug|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Release|Win32.ActiveCfg = Release|Win32 {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.Release|Win32.Build.0 = Release|Win32 + {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Debug|Win32.ActiveCfg = Debug|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Debug|Win32.Build.0 = Debug|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Release|Win32.ActiveCfg = Release|Win32 {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.Release|Win32.Build.0 = Release|Win32 + {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Debug|Win32.ActiveCfg = Debug|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Debug|Win32.Build.0 = Debug|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Release|Win32.ActiveCfg = Release|Win32 {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.Release|Win32.Build.0 = Release|Win32 + {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Debug|Win32.ActiveCfg = Debug|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Debug|Win32.Build.0 = Debug|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Release|Win32.ActiveCfg = Release|Win32 {94CD7910-649A-4075-9F33-7EBEE614FD45}.Release|Win32.Build.0 = Release|Win32 + {94CD7910-649A-4075-9F33-7EBEE614FD45}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {94CD7910-649A-4075-9F33-7EBEE614FD45}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {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}.Release|Win32.ActiveCfg = Release|Win32 {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.Debug|Win32.ActiveCfg = Debug|Win32 {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.Debug|Win32.Build.0 = Debug|Win32 {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.Release|Win32.ActiveCfg = Release|Win32 {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.Release|Win32.Build.0 = Release|Win32 + {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.ReleaseNoLTCG|Win32.ActiveCfg = Release|Win32 + {F23CC68D-1D58-4EB1-9425-A28F5058EB31}.ReleaseNoLTCG|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj =================================================================== --- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -5,6 +5,10 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseLTCG|Win32"> + <Configuration>ReleaseLTCG</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -20,6 +24,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseOfMfc>Static</UseOfMfc> + <WholeProgramOptimization>false</WholeProgramOptimization> + <PlatformToolset>v100</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>Static</UseOfMfc> <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v100</PlatformToolset> </PropertyGroup> @@ -34,6 +44,10 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </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" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> @@ -45,8 +59,12 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\bin\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">.\bin\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">$(Configuration)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-noLTCG</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Midl> @@ -120,7 +138,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>true</BufferSecurityCheck> - <FunctionLevelLinking>false</FunctionLevelLinking> + <FunctionLevelLinking>true</FunctionLevelLinking> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> @@ -132,7 +150,6 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>Default</CompileAs> <ExceptionHandling>Async</ExceptionHandling> - <AdditionalOptions>/O2 %(AdditionalOptions)</AdditionalOptions> <IntrinsicFunctions>true</IntrinsicFunctions> <FloatingPointModel>Fast</FloatingPointModel> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -159,11 +176,73 @@ <DataExecutionPrevention>false</DataExecutionPrevention> <IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries> + <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> </Link> <Manifest> <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles> </Manifest> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'"> + <Midl> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MkTypLibCompatible>true</MkTypLibCompatible> + <SuppressStartupBanner>true</SuppressStartupBanner> + <TargetEnvironment>Win32</TargetEnvironment> + <TypeLibraryName>.\Bin/mptrack.tlb</TypeLibraryName> + </Midl> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;MODPLUG_TRACKER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <FunctionLevelLinking>true</FunctionLevelLinking> + <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile>.\ReleaseLTCG/mptrack.pch</PrecompiledHeaderOutputFile> + <AssemblerListingLocation>.\ReleaseLTCG/</AssemblerListingLocation> + <ObjectFileName>.\ReleaseLTCG/</ObjectFileName> + <ProgramDataBaseFileName>.\ReleaseLTCG/</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>Default</CompileAs> + <ExceptionHandling>Async</ExceptionHandling> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>true</WholeProgramOptimization> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Link> + <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>winmm.lib;strmiids.lib;dmoguids.lib;version.lib;Rpcrt4.lib;delayimp.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + <Version>5.0</Version> + <SuppressStartupBanner>true</SuppressStartupBanner> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <DelayLoadDLLs>OpenMPT_SoundTouch_i16.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <GenerateDebugInformation>true</GenerateDebugInformation> + <GenerateMapFile>false</GenerateMapFile> + <MapFileName>.\ReleaseLTCG/mptrack.map</MapFileName> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>false</DataExecutionPrevention> + <IgnoreSpecificDefaultLibraries> + </IgnoreSpecificDefaultLibraries> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <Manifest> + <AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> + </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\AudioCriticalSection.cpp" /> <ClCompile Include="..\common\misc_util.cpp" /> @@ -251,9 +330,7 @@ <ClCompile Include="..\soundlib\snd_eq.cpp" /> <ClCompile Include="..\soundlib\snd_flt.cpp" /> <ClCompile Include="..\soundlib\Snd_fx.cpp" /> - <ClCompile Include="..\Soundlib\Snd_rvb.cpp"> - <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AssemblyAndSourceCode</AssemblerOutput> - </ClCompile> + <ClCompile Include="..\Soundlib\Snd_rvb.cpp" /> <ClCompile Include="..\Soundlib\snddev.cpp" /> <ClCompile Include="..\soundlib\Sndfile.cpp" /> <ClCompile Include="..\soundlib\Sndmix.cpp" /> @@ -261,7 +338,9 @@ <ClCompile Include="..\common\stdafx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">Create</PrecompiledHeader> <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</MultiProcessorCompilation> + <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">false</MultiProcessorCompilation> </ClCompile> <ClCompile Include="..\soundlib\Tables.cpp" /> <ClCompile Include="tagging.cpp" /> Modified: trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj =================================================================== --- trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/soundtouch/soundtouch_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -20,6 +20,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>NotSet</CharacterSet> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -85,6 +86,8 @@ <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>false</WholeProgramOptimization> + <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Link> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> @@ -100,6 +103,7 @@ </DataExecutionPrevention> <ImportLibrary>$(OutDir)soundtouch.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> + <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/OpenMPT/ungzip/ungzip_10.vcxproj =================================================================== --- trunk/OpenMPT/ungzip/ungzip_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/ungzip/ungzip_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -19,7 +19,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -68,6 +68,7 @@ <OmitDefaultLibName>true</OmitDefaultLibName> <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalIncludeDirectories>../include/</AdditionalIncludeDirectories> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/OpenMPT/unlha/unlha_10.vcxproj =================================================================== --- trunk/OpenMPT/unlha/unlha_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/unlha/unlha_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -19,6 +19,7 @@ <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -85,6 +86,7 @@ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: trunk/OpenMPT/unrar/unrar_10.vcxproj =================================================================== --- trunk/OpenMPT/unrar/unrar_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/unrar/unrar_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -18,6 +18,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseOfMfc>false</UseOfMfc> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -81,6 +82,7 @@ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> <ResourceCompile> <Culture>0x0409</Culture> Modified: trunk/OpenMPT/unzip/unzip_10.vcxproj =================================================================== --- trunk/OpenMPT/unzip/unzip_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/unzip/unzip_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -25,7 +25,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -74,6 +74,7 @@ <OmitDefaultLibName>true</OmitDefaultLibName> <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalIncludeDirectories>../include/zlib/</AdditionalIncludeDirectories> + <WholeProgramOptimization>false</WholeProgramOptimization> </ClCompile> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj =================================================================== --- trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj 2013-03-17 14:02:00 UTC (rev 1589) +++ trunk/OpenMPT/xsoundlib/xsoundlib_10.vcxproj 2013-03-17 14:05:53 UTC (rev 1590) @@ -19,6 +19,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> @@ -69,6 +70,8 @@ <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <WholeProgramOptimization>false</WholeProgramOptimization> + <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Lib> <OutputFile>$(OutDir)xsoundlib.lib</OutputFile> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |