From 61409ee2e674b0a386ae2bf2573607444fee2cae Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Mon, 21 Oct 2013 16:51:01 +0200 Subject: [PATCH] Fixed a problem in VS2013 project to file that always triggered a rebuild, even if nothing had been changed. --- LameXP_VS2013.vcxproj | 5 ++++- src/Global.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj index 821dc47e..461e5bdf 100644 --- a/LameXP_VS2013.vcxproj +++ b/LameXP_VS2013.vcxproj @@ -150,8 +150,8 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes false /wd4005 %(AdditionalOptions) false - false + "/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) @@ -177,6 +177,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes $(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories) true + Copy plugin DLL%27s @@ -230,6 +231,7 @@ del "$(TargetDir)imageformats\q???d4.dll" false /wd4005 %(AdditionalOptions) false + "/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) @@ -253,6 +255,7 @@ del "$(TargetDir)imageformats\q???d4.dll" true false false + diff --git a/src/Global.cpp b/src/Global.cpp index 29c538db..f8b24a75 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -1331,8 +1331,12 @@ bool lamexp_init_qt(int argc, char* argv[]) //Check for compat mode if(osVersionNo.overrideFlag && (osVersionNo <= lamexp_winver_win81)) { - qFatal("%s", QApplication::tr("Executable '%1' doesn't support Windows compatibility mode.").arg(executableName).toLatin1().constData()); - return false; + qWarning("Windows compatibility mode detected!"); + if(!arguments.contains("--ignore-compat-mode", Qt::CaseInsensitive)) + { + qFatal("%s", QApplication::tr("Executable '%1' doesn't support Windows compatibility mode.").arg(executableName).toLatin1().constData()); + return false; + } } //Check for Wine