Upgraded build environment to Microsoft Visual Studio 2012 Update-1 (CTP #4).

diff --git a/LameXP_VS2012.vcxproj b/LameXP_VS2012.vcxproj
index 05804ca..252ad2c 100644 (file)
--- a/LameXP_VS2012.vcxproj
+++ b/LameXP_VS2012.vcxproj
@@ -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>

diff --git a/doc/Changelog.html b/doc/Changelog.html
index 6ed3a98..7cb7b7c 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -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)

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index bfd6631..a5b0882 100644 (file)
--- 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 b98987d..b3d2e92 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -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 &apos;%1&apos; doesn&apos;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 &apos;%1&apos; 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 &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</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 &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 9cb9694..2c11f7e 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -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 &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; 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 &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; 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 &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation type="unfinished">Plik wykonywalny &quot;%1&quot; został skompilowany dla Qt &quot;%2&quot;, znaleziono &quot;%3&quot;.</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 &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; wymaga do uruchomienia Windows 2000 lub nowszego.</translation>
     </message>

diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 0504811..6d29819 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -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 &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation>EXE-filen &apos;%1&apos; 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 &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation>EXE-filen &apos;%1&apos; 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 &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation>EXE-filen &apos;%1&apos; är byggd för Qt &apos;%2&apos;, du har Qt &apos;%3&apos;.</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 &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation>EXE-filen &apos;%1&apos; kräver Windows 2000 eller senare.</translation>
     </message>

diff --git a/src/Config.h b/src/Config.h
index 6571fd7..39e827c 100644 (file)
--- 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 4c124bf..6c8dc1b 100644 (file)
--- 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)