Upgraded build environment to Microsoft Visual Studio 2012 Update-1 (CTP #4).
This commit is contained in:
parent
c220a0b73f
commit
41c129a0ec
@ -25,18 +25,18 @@
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
<PlatformToolset>v110_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
<PlatformToolset>v110_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
<PlatformToolset>v110_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
@ -64,21 +64,9 @@
|
||||
<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>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>"$(ProjectDir)\etc\Utilities\AutoInc.exe" "VER_LAMEXP_BUILD" "$(ProjectDir)\src\Config.h"</Command>
|
||||
@ -253,7 +241,6 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
||||
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
||||
<MapExports>false</MapExports>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
<MinimumRequiredVersion>5.1</MinimumRequiredVersion>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>
|
||||
|
||||
@ -18,6 +18,7 @@ a:visited { color: #0000EE; }
|
||||
<h3>LameXP - Version History</h3><br>
|
||||
|
||||
<a name="4.07"></a>Changes between v4.06 and v4.07 [<font color="darkred">unreleased</font>]:<br><ul>
|
||||
<li>Upgraded build environment to Microsoft Visual Studio 2012 Update-1 (CTP #4)
|
||||
<li>Added option to select the "overwrite mode" to advanced options tab
|
||||
<li>Added option to filter the log entries on the "processing" dialog (see context menu)
|
||||
<li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.5 (2012-11-23)
|
||||
|
||||
@ -277,17 +277,20 @@ Function .onInit
|
||||
; --------
|
||||
|
||||
${IfNot} ${IsNT}
|
||||
MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application does NOT support Windows 9x or Windows ME!"
|
||||
MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, this application does *not* support Windows 9x or Windows ME!"
|
||||
Quit
|
||||
${EndIf}
|
||||
|
||||
${If} ${AtMostWinNT4}
|
||||
${StdUtils.GetParameter} $R0 "Update" "?"
|
||||
${If} $R0 == "?"
|
||||
MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, your platform is not supported anymore. Installation aborted!$\nThe minimum required platform is Windows 2000."
|
||||
${Else}
|
||||
MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, your platform is not supported anymore. Update not possible!$\nThe minimum required platform is Windows 2000."
|
||||
${EndIf}
|
||||
${If} ${AtMostWin2000}
|
||||
MessageBox MB_TOPMOST|MB_ICONSTOP "Sorry, but your platform is *not* supported anymore.$\nInstallation will be aborted!$\n$\nThe minimum required platform is Windows XP (Service Pack 3)."
|
||||
Quit
|
||||
${EndIf}
|
||||
|
||||
${If} ${IsWinXP}
|
||||
${AndIf} ${AtMostServicePack} 2
|
||||
MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires Windows XP with Service Pack 3.$\nSupport for Windows XP prior to Service Pack 3 is discontinued!"
|
||||
MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 3 for Windows XP now?" IDNO +2
|
||||
ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=24"
|
||||
Quit
|
||||
${EndIf}
|
||||
|
||||
|
||||
@ -3243,23 +3243,23 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="874"/>
|
||||
<location filename="../../src/Global.cpp" line="882"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1129"/>
|
||||
<location filename="../../src/Global.cpp" line="1137"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1134"/>
|
||||
<location filename="../../src/Global.cpp" line="1142"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1147"/>
|
||||
<location filename="../../src/Global.cpp" line="1174"/>
|
||||
<location filename="../../src/Global.cpp" line="1155"/>
|
||||
<location filename="../../src/Global.cpp" line="1182"/>
|
||||
<source>Executable '%1' requires Windows 2000 or later.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
|
||||
@ -3244,23 +3244,23 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="874"/>
|
||||
<location filename="../../src/Global.cpp" line="882"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation type="unfinished">Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1129"/>
|
||||
<location filename="../../src/Global.cpp" line="1137"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation type="unfinished">Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1134"/>
|
||||
<location filename="../../src/Global.cpp" line="1142"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation type="unfinished">Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3".</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1147"/>
|
||||
<location filename="../../src/Global.cpp" line="1174"/>
|
||||
<location filename="../../src/Global.cpp" line="1155"/>
|
||||
<location filename="../../src/Global.cpp" line="1182"/>
|
||||
<source>Executable '%1' requires Windows 2000 or later.</source>
|
||||
<translation type="unfinished">Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego.</translation>
|
||||
</message>
|
||||
|
||||
@ -3245,23 +3245,23 @@
|
||||
<context>
|
||||
<name>QApplication</name>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="874"/>
|
||||
<location filename="../../src/Global.cpp" line="882"/>
|
||||
<source>Executable '%1' doesn't support Windows compatibility mode.</source>
|
||||
<translation>EXE-filen '%1' stöder inte Windows kompatibilitetsläge.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1129"/>
|
||||
<location filename="../../src/Global.cpp" line="1137"/>
|
||||
<source>Executable '%1' requires Qt v%2, but found Qt v%3.</source>
|
||||
<translation>EXE-filen '%1' kräver Qt v%2, du har Qt v%3.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1134"/>
|
||||
<location filename="../../src/Global.cpp" line="1142"/>
|
||||
<source>Executable '%1' was built for Qt '%2', but found Qt '%3'.</source>
|
||||
<translation>EXE-filen '%1' är byggd för Qt '%2', du har Qt '%3'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../src/Global.cpp" line="1147"/>
|
||||
<location filename="../../src/Global.cpp" line="1174"/>
|
||||
<location filename="../../src/Global.cpp" line="1155"/>
|
||||
<location filename="../../src/Global.cpp" line="1182"/>
|
||||
<source>Executable '%1' requires Windows 2000 or later.</source>
|
||||
<translation>EXE-filen '%1' kräver Windows 2000 eller senare.</translation>
|
||||
</message>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#define VER_LAMEXP_MINOR_LO 7
|
||||
#define VER_LAMEXP_TYPE Alpha
|
||||
#define VER_LAMEXP_PATCH 4
|
||||
#define VER_LAMEXP_BUILD 1196
|
||||
#define VER_LAMEXP_BUILD 1197
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Tool versions (minimum expected versions!)
|
||||
|
||||
@ -162,14 +162,20 @@ static bool g_lamexp_console_attached = false;
|
||||
#if (_MSC_VER == 1700)
|
||||
#if (_MSC_FULL_VER < 170050727)
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2012-Beta";
|
||||
#elif (_MSC_FULL_VER < 170051020)
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2012-RTM";
|
||||
#elif (_MSC_FULL_VER == 170051020)
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2012-U1 CTP";
|
||||
#else
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2012";
|
||||
#error Compiler version is not supported yet!
|
||||
#endif
|
||||
#elif (_MSC_VER == 1600)
|
||||
#if (_MSC_FULL_VER >= 160040219)
|
||||
#if (_MSC_FULL_VER < 160040219)
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2010-RTM";
|
||||
#elif (_MSC_FULL_VER == 160040219)
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2010-SP1";
|
||||
#else
|
||||
static const char *g_lamexp_version_compiler = "MSVC 2010";
|
||||
#error Compiler version is not supported yet!
|
||||
#endif
|
||||
#elif (_MSC_VER == 1500)
|
||||
#if (_MSC_FULL_VER >= 150030729)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user