Skip to content

Commit

Permalink
Updated Visual Studio 2012 to "Update 1" (final release).
Browse files Browse the repository at this point in the history
  • Loading branch information
@lordmulder
lordmulder committed Nov 28, 2012
1 parent 316da47 commit 1e09d99
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 20 deletions.
5 changes: 3 additions & 2 deletions LameXP_VS2012.vcxproj
View file
Expand Up @@ -133,7 +133,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -145,6 +145,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes
<TreatWarningAsError>true</TreatWarningAsError>
<CompileAsManaged>false</CompileAsManaged>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
<BufferSecurityCheck>false</BufferSecurityCheck>
</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>
Expand Down Expand Up @@ -205,7 +206,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
Expand Down
Binary file modified etc/Prerequisites/keccak/lib/Debug/QKeccakHash_VS2012.lib
View file
Binary file not shown.
Binary file modified etc/Prerequisites/keccak/lib/Release/QKeccakHash_VS2012.lib
View file
Binary file not shown.
Binary file modified etc/Prerequisites/keccak/lib/Release_Static/QKeccakHash_VS2012.lib
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions etc/Translation/Blank.ts
View file
Expand Up @@ -3243,23 +3243,23 @@
<context>
<name>QApplication</name>
<message>
<location filename="../../src/Global.cpp" line="880"/>
<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="1135"/>
<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="1140"/>
<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="1153"/>
<location filename="../../src/Global.cpp" line="1180"/>
<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>
Expand Down
10 changes: 5 additions & 5 deletions etc/Translation/LameXP_PL.ts
View file
Expand Up @@ -3244,23 +3244,23 @@
<context>
<name>QApplication</name>
<message>
<location filename="../../src/Global.cpp" line="880"/>
<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="1135"/>
<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="1140"/>
<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="1153"/>
<location filename="../../src/Global.cpp" line="1180"/>
<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>
Expand Down
10 changes: 5 additions & 5 deletions etc/Translation/LameXP_SV.ts
View file
Expand Up @@ -3245,23 +3245,23 @@
<context>
<name>QApplication</name>
<message>
<location filename="../../src/Global.cpp" line="880"/>
<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="1135"/>
<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="1140"/>
<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="1153"/>
<location filename="../../src/Global.cpp" line="1180"/>
<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>
Expand Down
2 changes: 1 addition & 1 deletion src/Config.h
View file
Expand Up @@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 1198
#define VER_LAMEXP_BUILD 1199

///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
Expand Down
4 changes: 3 additions & 1 deletion src/Global.cpp
View file
Expand Up @@ -164,8 +164,10 @@ static bool g_lamexp_console_attached = false;
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)
#elif (_MSC_FULL_VER < 170051106)
static const char *g_lamexp_version_compiler = "MSVC 2012-U1 CTP";
#elif (_MSC_FULL_VER == 170051106)
static const char *g_lamexp_version_compiler = "MSVC 2012-U1";
#else
#error Compiler version is not supported yet!
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Global.h
View file
Expand Up @@ -220,7 +220,7 @@ while(0)

//Check for CPU-compatibility options
#if !defined(_M_X64) && defined(_MSC_VER) && defined(_M_IX86_FP)
#if (_M_IX86_FP != 0) && (_MSC_VER < 1700)
#if (_M_IX86_FP != 0)
#error We should not enabled SSE or SSE2 in release builds!
#endif
#endif

0 comments on commit 1e09d99

Please sign in to comment.