From: <man...@us...> - 2013-11-06 13:00:10
|
Revision: 3096 http://sourceforge.net/p/modplug/code/3096 Author: manxorist Date: 2013-11-06 12:59:58 +0000 (Wed, 06 Nov 2013) Log Message: ----------- [Int] Rename 'Normal' project configuration for included projects to 'ReleaseNoLTCG'. Modified Paths: -------------- trunk/OpenMPT/build/UnRAR.vcproj trunk/OpenMPT/build/UnRAR.vcxproj trunk/OpenMPT/build/UnRAR.vcxproj.filters trunk/OpenMPT/build/flac.vcproj trunk/OpenMPT/build/flac.vcxproj trunk/OpenMPT/build/flac.vcxproj.filters trunk/OpenMPT/build/lhasa.vcproj trunk/OpenMPT/build/lhasa.vcxproj trunk/OpenMPT/build/lhasa.vcxproj.filters trunk/OpenMPT/build/miniz.vcproj trunk/OpenMPT/build/miniz.vcxproj trunk/OpenMPT/build/miniz.vcxproj.filters trunk/OpenMPT/build/minizip.vcproj trunk/OpenMPT/build/minizip.vcxproj trunk/OpenMPT/build/minizip.vcxproj.filters trunk/OpenMPT/build/portaudio.vcproj trunk/OpenMPT/build/portaudio.vcxproj trunk/OpenMPT/build/portaudio.vcxproj.filters trunk/OpenMPT/build/portmidi.vcproj trunk/OpenMPT/build/portmidi.vcxproj trunk/OpenMPT/build/portmidi.vcxproj.filters trunk/OpenMPT/build/smbPitchShift.vcproj trunk/OpenMPT/build/smbPitchShift.vcxproj trunk/OpenMPT/build/smbPitchShift.vcxproj.filters trunk/OpenMPT/build/soundtouch.vcproj trunk/OpenMPT/build/soundtouch.vcxproj trunk/OpenMPT/build/soundtouch.vcxproj.filters trunk/OpenMPT/build/zlib.vcproj trunk/OpenMPT/build/zlib.vcxproj trunk/OpenMPT/build/zlib.vcxproj.filters trunk/OpenMPT/include/premake4-defaults-DLL.lua trunk/OpenMPT/include/premake4-defaults.lua trunk/OpenMPT/include/premake4.lua trunk/OpenMPT/mptrack/MPTRACK_10.sln Modified: trunk/OpenMPT/build/UnRAR.vcproj =================================================================== --- trunk/OpenMPT/build/UnRAR.vcproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/UnRAR.vcproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -172,9 +172,9 @@ /> </Configuration> <Configuration - Name="Normal|Win32" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\unrar\x32\Normal" + Name="Release|Win32" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\unrar\x32\Release" ConfigurationType="4" CharacterSet="2" > @@ -195,7 +195,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\include\unrar" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -249,9 +249,9 @@ /> </Configuration> <Configuration - Name="Normal|x64" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\unrar\x64\Normal" + Name="Release|x64" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\unrar\x64\Release" ConfigurationType="4" CharacterSet="2" > @@ -273,7 +273,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\include\unrar" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -327,9 +327,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\unrar\x32\Release" + Name="ReleaseNoLTCG|Win32" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\unrar\x32\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -350,7 +350,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\unrar" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -404,9 +404,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\unrar\x64\Release" + Name="ReleaseNoLTCG|x64" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\unrar\x64\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -428,7 +428,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\unrar" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" Modified: trunk/OpenMPT/build/UnRAR.vcxproj =================================================================== --- trunk/OpenMPT/build/UnRAR.vcxproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/UnRAR.vcxproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -9,14 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Normal|Win32"> - <Configuration>Normal</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Normal|x64"> - <Configuration>Normal</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -25,6 +17,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|Win32"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|x64"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{95CC809B-03FC-4EDB-BB20-FD07A698C05F}</ProjectGuid> @@ -42,25 +42,25 @@ <CharacterSet>MultiByte</CharacterSet> <UseDebugLibraries>true</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -75,16 +75,16 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> @@ -96,18 +96,18 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\unrar\x64\Debug\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UnRAR64</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\unrar\x32\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">UnRAR</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\unrar\x64\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">UnRAR64</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\unrar\x32\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UnRAR</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\unrar\x64\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UnRAR64</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\unrar\x32\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">UnRAR</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\unrar\x64\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">UnRAR64</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -161,9 +161,9 @@ <ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -191,9 +191,9 @@ <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -221,9 +221,9 @@ <ProgramDataBaseFileName>$(OutDir)UnRAR64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'"> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -251,9 +251,9 @@ <ProgramDataBaseFileName>$(OutDir)UnRAR.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'"> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\unrar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: trunk/OpenMPT/build/UnRAR.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/UnRAR.vcxproj.filters 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/UnRAR.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096) @@ -2,10 +2,10 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="include"> - <UniqueIdentifier>{C33E6B99-3E56-A84C-8825-E248657D8D47}</UniqueIdentifier> + <UniqueIdentifier>{9FE71192-DB6B-5041-A92C-32BDD18C730D}</UniqueIdentifier> </Filter> <Filter Include="include\unrar"> - <UniqueIdentifier>{31EF34FC-AB77-3945-A5E4-1B0B566E0A04}</UniqueIdentifier> + <UniqueIdentifier>{3A336712-7D81-3948-BA4A-D73201BEA649}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/flac.vcproj =================================================================== --- trunk/OpenMPT/build/flac.vcproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/flac.vcproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -176,9 +176,9 @@ /> </Configuration> <Configuration - Name="Normal|Win32" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\flac\x32\Normal" + Name="Release|Win32" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\flac\x32\Release" ConfigurationType="4" CharacterSet="2" > @@ -199,7 +199,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4267 /wd4334 /GL- /MP" + AdditionalOptions="/wd4267 /wd4334 /MP" Optimization="3" AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include" PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -254,9 +254,9 @@ /> </Configuration> <Configuration - Name="Normal|x64" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\flac\x64\Normal" + Name="Release|x64" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\flac\x64\Release" ConfigurationType="4" CharacterSet="2" > @@ -278,7 +278,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4267 /wd4334 /GL- /MP" + AdditionalOptions="/wd4267 /wd4334 /MP" Optimization="3" AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include" PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -333,9 +333,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\flac\x32\Release" + Name="ReleaseNoLTCG|Win32" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\flac\x32\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -356,7 +356,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4267 /wd4334 /MP" + AdditionalOptions="/wd4267 /wd4334 /GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include" PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -411,9 +411,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\flac\x64\Release" + Name="ReleaseNoLTCG|x64" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\flac\x64\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -435,7 +435,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4267 /wd4334 /MP" + AdditionalOptions="/wd4267 /wd4334 /GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\flac\include;..\include\flac\src\libFLAC\include" PreprocessorDefinitions="FLAC__NO_DLL;VERSION=\"1.2.1\";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" Modified: trunk/OpenMPT/build/flac.vcxproj =================================================================== --- trunk/OpenMPT/build/flac.vcxproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/flac.vcxproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -9,14 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Normal|Win32"> - <Configuration>Normal</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Normal|x64"> - <Configuration>Normal</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -25,6 +17,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|Win32"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|x64"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}</ProjectGuid> @@ -42,25 +42,25 @@ <CharacterSet>MultiByte</CharacterSet> <UseDebugLibraries>true</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -75,16 +75,16 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> @@ -96,18 +96,18 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\flac\x64\Debug\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flac64</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\flac\x32\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">flac</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\flac\x64\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">flac64</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\flac\x32\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">flac</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\flac\x64\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flac64</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\flac\x32\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">flac</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\flac\x64\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">flac64</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -165,9 +165,9 @@ <ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -196,9 +196,9 @@ <ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -227,9 +227,9 @@ <ProgramDataBaseFileName>$(OutDir)flac64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'"> <ClCompile> - <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -258,9 +258,9 @@ <ProgramDataBaseFileName>$(OutDir)flac.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'"> <ClCompile> - <AdditionalOptions>/wd4267 /wd4334 /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/wd4267 /wd4334 /GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\flac\include;..\include\flac\src\libFLAC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>FLAC__NO_DLL;VERSION="1.2.1";NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: trunk/OpenMPT/build/flac.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/flac.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096) @@ -2,31 +2,31 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="include"> - <UniqueIdentifier>{0114BCBA-6E88-444C-AD8F-E46998E4DB08}</UniqueIdentifier> + <UniqueIdentifier>{15185494-76EB-8B47-B933-96DB3E256190}</UniqueIdentifier> </Filter> <Filter Include="include\flac"> - <UniqueIdentifier>{8FFEB476-CF16-054B-8D2A-748D6593C6CE}</UniqueIdentifier> + <UniqueIdentifier>{593AB6B7-383E-BA42-B1A5-21A12FFC6E17}</UniqueIdentifier> </Filter> <Filter Include="include\flac\src"> - <UniqueIdentifier>{4CD4FC61-6823-FA43-A510-FADB7D7D6ADC}</UniqueIdentifier> + <UniqueIdentifier>{1E7FF733-2E9B-9340-A8DE-6B2D05191C7D}</UniqueIdentifier> </Filter> <Filter Include="include\flac\src\libFLAC"> - <UniqueIdentifier>{209C5B30-7CF5-274D-9E0A-5315D2820C57}</UniqueIdentifier> + <UniqueIdentifier>{93D40968-3ABD-B649-BED6-4EE88041D22C}</UniqueIdentifier> </Filter> <Filter Include="include\flac\src\libFLAC\include"> - <UniqueIdentifier>{6ECB279F-BECE-BB43-9AAB-A7E5E154FEF3}</UniqueIdentifier> + <UniqueIdentifier>{D79C2522-5B53-1544-9930-D5DFFC6CB112}</UniqueIdentifier> </Filter> <Filter Include="include\flac\src\libFLAC\include\private"> - <UniqueIdentifier>{6A258816-CB66-6E45-9A4D-A3AD17D1FE43}</UniqueIdentifier> + <UniqueIdentifier>{614D2380-3BBF-7E40-88A5-8D045D5D3EB5}</UniqueIdentifier> </Filter> <Filter Include="include\flac\src\libFLAC\include\protected"> - <UniqueIdentifier>{FDE78CAB-955D-8949-BF79-C5C70623D648}</UniqueIdentifier> + <UniqueIdentifier>{55FD65F0-65DC-7546-8F4B-16C46A417DC0}</UniqueIdentifier> </Filter> <Filter Include="include\flac\include"> - <UniqueIdentifier>{E809B9E3-9947-BC42-BE8B-E0028FC83861}</UniqueIdentifier> + <UniqueIdentifier>{DB4C430F-246D-DD49-9B9B-9F3FA19B6E12}</UniqueIdentifier> </Filter> <Filter Include="include\flac\include\FLAC"> - <UniqueIdentifier>{582616E8-0688-374F-AB49-C19BAB85A06F}</UniqueIdentifier> + <UniqueIdentifier>{F9E0C192-74B7-9C4F-A474-F49E35056ADA}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/lhasa.vcproj =================================================================== --- trunk/OpenMPT/build/lhasa.vcproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/lhasa.vcproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -174,9 +174,9 @@ /> </Configuration> <Configuration - Name="Normal|Win32" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\lhasa\x32\Normal" + Name="Release|Win32" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\lhasa\x32\Release" ConfigurationType="4" CharacterSet="2" > @@ -197,7 +197,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -252,9 +252,9 @@ /> </Configuration> <Configuration - Name="Normal|x64" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\lhasa\x64\Normal" + Name="Release|x64" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\lhasa\x64\Release" ConfigurationType="4" CharacterSet="2" > @@ -276,7 +276,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -331,9 +331,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\lhasa\x32\Release" + Name="ReleaseNoLTCG|Win32" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\lhasa\x32\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -354,7 +354,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" @@ -409,9 +409,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\lhasa\x64\Release" + Name="ReleaseNoLTCG|x64" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\lhasa\x64\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -433,7 +433,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" AdditionalIncludeDirectories="..\include\msinttypes\inttypes;..\include\msinttypes\stdint" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" Modified: trunk/OpenMPT/build/lhasa.vcxproj =================================================================== --- trunk/OpenMPT/build/lhasa.vcxproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/lhasa.vcxproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -9,14 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Normal|Win32"> - <Configuration>Normal</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Normal|x64"> - <Configuration>Normal</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -25,6 +17,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|Win32"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|x64"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{6B11F6A8-B131-4D2B-80EF-5731A9016436}</ProjectGuid> @@ -42,25 +42,25 @@ <CharacterSet>MultiByte</CharacterSet> <UseDebugLibraries>true</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -75,16 +75,16 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> @@ -96,18 +96,18 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\lhasa\x64\Debug\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lhasa64</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\lhasa\x32\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">lhasa</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\lhasa\x64\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">lhasa64</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\lhasa\x32\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lhasa</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\lhasa\x64\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lhasa64</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\lhasa\x32\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">lhasa</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\lhasa\x64\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">lhasa64</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -163,9 +163,9 @@ <ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -194,9 +194,9 @@ <ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -225,9 +225,9 @@ <ProgramDataBaseFileName>$(OutDir)lhasa64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'"> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -256,9 +256,9 @@ <ProgramDataBaseFileName>$(OutDir)lhasa.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'"> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\include\msinttypes\inttypes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> Modified: trunk/OpenMPT/build/lhasa.vcxproj.filters =================================================================== --- trunk/OpenMPT/build/lhasa.vcxproj.filters 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/lhasa.vcxproj.filters 2013-11-06 12:59:58 UTC (rev 3096) @@ -2,16 +2,16 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="include"> - <UniqueIdentifier>{5D81F21A-1E84-0A47-A28E-CFC5D0389760}</UniqueIdentifier> + <UniqueIdentifier>{19494FDD-2706-8347-962A-7DAEA0E8CC3B}</UniqueIdentifier> </Filter> <Filter Include="include\lhasa"> - <UniqueIdentifier>{311363F1-7C18-0C42-8AAB-77B071F11462}</UniqueIdentifier> + <UniqueIdentifier>{1A2C2CCD-C268-3946-97B3-AF6438E24160}</UniqueIdentifier> </Filter> <Filter Include="include\lhasa\lib"> - <UniqueIdentifier>{58672F74-331E-D147-BD11-CFC740EA2957}</UniqueIdentifier> + <UniqueIdentifier>{28F6BA1F-75E0-5C40-AD75-5160411D3127}</UniqueIdentifier> </Filter> <Filter Include="include\lhasa\lib\public"> - <UniqueIdentifier>{46F8A074-951F-4F41-825F-9084BE47C89A}</UniqueIdentifier> + <UniqueIdentifier>{44CA7BAC-69A4-4B49-81F6-FC57357E1B06}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> Modified: trunk/OpenMPT/build/miniz.vcproj =================================================================== --- trunk/OpenMPT/build/miniz.vcproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/miniz.vcproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -170,9 +170,9 @@ /> </Configuration> <Configuration - Name="Normal|Win32" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\miniz\x32\Normal" + Name="Release|Win32" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\miniz\x32\Release" ConfigurationType="4" CharacterSet="2" > @@ -193,7 +193,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" @@ -246,9 +246,9 @@ /> </Configuration> <Configuration - Name="Normal|x64" - OutputDirectory="..\include\bin\Normal" - IntermediateDirectory="obj\miniz\x64\Normal" + Name="Release|x64" + OutputDirectory="..\include\bin\Release" + IntermediateDirectory="obj\miniz\x64\Release" ConfigurationType="4" CharacterSet="2" > @@ -270,7 +270,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/GL- /MP" + AdditionalOptions="/MP" Optimization="3" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" @@ -323,9 +323,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\miniz\x32\Release" + Name="ReleaseNoLTCG|Win32" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\miniz\x32\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -346,7 +346,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" @@ -399,9 +399,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\include\bin\Release" - IntermediateDirectory="obj\miniz\x64\Release" + Name="ReleaseNoLTCG|x64" + OutputDirectory="..\include\bin\ReleaseNoLTCG" + IntermediateDirectory="obj\miniz\x64\ReleaseNoLTCG" ConfigurationType="4" CharacterSet="2" > @@ -423,7 +423,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + AdditionalOptions="/GL- /MP" Optimization="3" PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" StringPooling="true" Modified: trunk/OpenMPT/build/miniz.vcxproj =================================================================== --- trunk/OpenMPT/build/miniz.vcxproj 2013-11-06 12:44:23 UTC (rev 3095) +++ trunk/OpenMPT/build/miniz.vcxproj 2013-11-06 12:59:58 UTC (rev 3096) @@ -9,14 +9,6 @@ <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Normal|Win32"> - <Configuration>Normal</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Normal|x64"> - <Configuration>Normal</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> @@ -25,6 +17,14 @@ <Configuration>Release</Configuration> <Platform>x64</Platform> </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|Win32"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="ReleaseNoLTCG|x64"> + <Configuration>ReleaseNoLTCG</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}</ProjectGuid> @@ -42,25 +42,25 @@ <CharacterSet>MultiByte</CharacterSet> <UseDebugLibraries>true</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> <UseDebugLibraries>false</UseDebugLibraries> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> @@ -75,16 +75,16 @@ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> @@ -96,18 +96,18 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\bin\Debug\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\miniz\x64\Debug\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">miniz64</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">obj\miniz\x32\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'">miniz</TargetName> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">..\include\bin\Normal\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">obj\miniz\x64\Normal\</IntDir> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Normal|x64'">miniz64</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\miniz\x32\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">miniz</TargetName> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\bin\Release\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\miniz\x64\Release\</IntDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">miniz64</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">obj\miniz\x32\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'">miniz</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">..\include\bin\ReleaseNoLTCG\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">obj\miniz\x64\ReleaseNoLTCG\</IntDir> + <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|x64'">miniz64</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -159,9 +159,9 @@ <ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> @@ -188,9 +188,9 @@ <ProgramDataBaseFileName>$(OutDir)miniz.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Normal|x64'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> @@ -217,9 +217,9 @@ <ProgramDataBaseFileName>$(OutDir)miniz64.pdb</ProgramDataBaseFileName> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoLTCG|Win32'"> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/GL- /MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Full</Optimization> <PreprocessorDefinitions>NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <... [truncated message content] |