Updated Visual Studio 2012 to "Update 1" (final release).
This commit is contained in:
parent
316da47f10
commit
1e09d998a2
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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 '%1' doesn'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 '%1' 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 '%1' was built for Qt '%2', but found Qt '%3'.</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 '%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="880"/>
|
||||
<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="1135"/>
|
||||
<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="1140"/>
|
||||
<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="1153"/>
|
||||
<location filename="../../src/Global.cpp" line="1180"/>
|
||||
<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="880"/>
|
||||
<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="1135"/>
|
||||
<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="1140"/>
|
||||
<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="1153"/>
|
||||
<location filename="../../src/Global.cpp" line="1180"/>
|
||||
<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 1198
|
||||
#define VER_LAMEXP_BUILD 1199
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Tool versions (minimum expected versions!)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user