diff --git a/LameXP_VS2012.vcxproj b/LameXP_VS2012.vcxproj index 05804cad..252ad2cb 100644 --- a/LameXP_VS2012.vcxproj +++ b/LameXP_VS2012.vcxproj @@ -25,18 +25,18 @@ Application Unicode true - v110 + v110_xp Application Unicode true - v110 + v110_xp Application Unicode - v110 + v110_xp @@ -64,21 +64,9 @@ false false - - $(LXP_WINSDK_ROOT)\Include;$(IncludePath) - $(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath) - $(LXP_WINSDK_ROOT)\Lib;$(LibraryPath) - - - $(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath) - $(LXP_WINSDK_ROOT)\Include;$(IncludePath) - $(LXP_WINSDK_ROOT)\Lib;$(LibraryPath) - - - $(LXP_WINSDK_ROOT)\Bin;$(LXP_WINSDK_ROOT)\Bin\vsstools;$(ExecutablePath) - $(LXP_WINSDK_ROOT)\Include;$(IncludePath) - $(LXP_WINSDK_ROOT)\Lib;$(LibraryPath) - + + + "$(ProjectDir)\etc\Utilities\AutoInc.exe" "VER_LAMEXP_BUILD" "$(ProjectDir)\src\Config.h" @@ -253,7 +241,6 @@ del "$(TargetDir)imageformats\q???d4.dll" true false false - 5.1 diff --git a/doc/Changelog.html b/doc/Changelog.html index 6ed3a98b..7cb7b7c8 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -18,6 +18,7 @@ a:visited { color: #0000EE; }

LameXP - Version History


Changes between v4.06 and v4.07 [unreleased]:
    +
  • Upgraded build environment to Microsoft Visual Studio 2012 Update-1 (CTP #4)
  • Added option to select the "overwrite mode" to advanced options tab
  • Added option to filter the log entries on the "processing" dialog (see context menu)
  • Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.5 (2012-11-23) diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index bfd66318..a5b0882e 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -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} diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index b98987d2..b3d2e926 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -3243,23 +3243,23 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. - + Executable '%1' requires Qt v%2, but found Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. - - + + Executable '%1' requires Windows 2000 or later. diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 9cb96947..2c11f7ee 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -3244,23 +3244,23 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows. - + Executable '%1' requires Qt v%2, but found Qt v%3. Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3". - - + + Executable '%1' requires Windows 2000 or later. Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego. diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index 0504811c..6d29819d 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -3245,23 +3245,23 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. EXE-filen '%1' stöder inte Windows kompatibilitetsläge. - + Executable '%1' requires Qt v%2, but found Qt v%3. EXE-filen '%1' kräver Qt v%2, du har Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. EXE-filen '%1' är byggd för Qt '%2', du har Qt '%3'. - - + + Executable '%1' requires Windows 2000 or later. EXE-filen '%1' kräver Windows 2000 eller senare. diff --git a/src/Config.h b/src/Config.h index 6571fd78..39e827c9 100644 --- a/src/Config.h +++ b/src/Config.h @@ -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!) diff --git a/src/Global.cpp b/src/Global.cpp index 4c124bf5..6c8dc1bf 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -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)