build: fixes to build on linux

*   dont use Q_PROCESSOR macros for 32/64 getArchitectureType
    move the function from lib_gui to lib
*   added missing include
This commit is contained in:
Andreas Stallinger
2017-05-10 15:33:31 +02:00
parent f3cd9a1770
commit 2136e30a48
8 changed files with 18 additions and 15 deletions
@@ -5,6 +5,7 @@
#include "utility/file/FilePath.h"
#include "utility/utilityApp.h"
#include "utility/utility.h"
JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)
-12
View File
@@ -78,18 +78,6 @@ void utility::killRunningProcesses()
}
}
ApplicationArchitectureType utility::getApplicationArchitectureType()
{
#ifdef Q_PROCESSOR_X86_64
return APPLICATION_ARCHITECTURE_X86_64;
#endif
#ifdef Q_PROCESSOR_X86_32
return APPLICATION_ARCHITECTURE_X86_32;
#endif
return APPLICATION_ARCHITECTURE_UNKNOWN;
}
int utility::getIdealThreadCount()
{
return QThread::idealThreadCount();
-2
View File
@@ -14,8 +14,6 @@ namespace utility
void killRunningProcesses();
ApplicationArchitectureType getApplicationArchitectureType();
int getIdealThreadCount();
}