Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Fixed a problem in VS2013 project to file that always triggered a rebuild, even if nothing had been changed.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-10-21 16:51:01 +02:00
parent 496f9cda7b
commit 61409ee2e6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LameXP_VS2013.vcxproj
View File

@ -150,8 +150,8 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes
<CompileAsManaged>false</CompileAsManaged> <CompileAsManaged>false</CompileAsManaged>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<ProgramDataBaseFileName />
<EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
<ProgramDataBaseFileName />
</ClCompile> </ClCompile>
<Link> <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> <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>
@ -177,6 +177,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes
</CreateHotPatchableImage> </CreateHotPatchableImage>
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
<ProgramDatabaseFile />
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Message>Copy plugin DLL%27s</Message> <Message>Copy plugin DLL%27s</Message>
@ -230,6 +231,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/wd4005 %(AdditionalOptions)</AdditionalOptions>
<EnableParallelCodeGeneration>false</EnableParallelCodeGeneration> <EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
<ProgramDataBaseFileName />
</ClCompile> </ClCompile>
<Link> <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> <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>
@ -253,6 +255,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
<MapExports>false</MapExports> <MapExports>false</MapExports>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<ProgramDatabaseFile />
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command> <Command>

4
src/Global.cpp
View File

@ -1330,10 +1330,14 @@ bool lamexp_init_qt(int argc, char* argv[])
//Check for compat mode //Check for compat mode
if(osVersionNo.overrideFlag && (osVersionNo <= lamexp_winver_win81)) if(osVersionNo.overrideFlag && (osVersionNo <= lamexp_winver_win81))
{
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()); qFatal("%s", QApplication::tr("Executable '%1' doesn't support Windows compatibility mode.").arg(executableName).toLatin1().constData());
return false; return false;
} }
}
//Check for Wine //Check for Wine
if(lamexp_detect_wine()) if(lamexp_detect_wine())