Make VS2010 configurations use the Windows SDK v7.1. Needs to set the LXP_WINSDK_ROOT environment variable.

This commit is contained in:
LoRd_MuldeR 2012-11-17 21:54:11 +01:00
parent 93f8e28620
commit 15697af84d
2 changed files with 27 additions and 2 deletions

View File

@ -64,6 +64,21 @@
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnableManagedIncrementalBuild>
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</EnableManagedIncrementalBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">
<IncludePath>$(LXP_WINSDK_ROOT)\Include;$(IncludePath)</IncludePath>
<ExecutablePath>$(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath)</ExecutablePath>
<LibraryPath>$(LXP_WINSDK_ROOT)\Lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ExecutablePath>$(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath)</ExecutablePath>
<IncludePath>$(LXP_WINSDK_ROOT)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(LXP_WINSDK_ROOT)\Lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ExecutablePath>$(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath)</ExecutablePath>
<IncludePath>$(LXP_WINSDK_ROOT)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(LXP_WINSDK_ROOT)\Lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>"$(ProjectDir)\etc\Utilities\AutoInc.exe" "VER_LAMEXP_BUILD" "$(ProjectDir)\src\Config.h"</Command>
@ -141,6 +156,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes
</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
<CompileAsManaged>false</CompileAsManaged>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions)</AdditionalOptions>
@ -205,13 +221,15 @@ del "$(TargetDir)imageformats\q???d4.dll"
<FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>None</DebugInformationFormat>
<DebugInformationFormat>
</DebugInformationFormat>
<CreateHotpatchableImage>false</CreateHotpatchableImage>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<OpenMPSupport>false</OpenMPSupport>
<CompileAsManaged>false</CompileAsManaged>
<TreatWarningAsError>true</TreatWarningAsError>
<BufferSecurityCheck>false</BufferSecurityCheck>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions)</AdditionalOptions>
@ -243,7 +261,14 @@ del "$(TargetDir)imageformats\q???d4.dll"
</PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>_CONFIG_NAME=$(ConfigurationName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
</ResourceCompile>
<Manifest>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
</Manifest>
<Xdcmake>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
</Xdcmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\Decoder_AAC.cpp" />

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 1192
#define VER_LAMEXP_BUILD 1194
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)