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:
@@ -2,6 +2,7 @@
|
||||
#define UNDO_REDO_VIEW_H
|
||||
|
||||
#include "component/view/View.h"
|
||||
#include <vector>
|
||||
|
||||
class UndoRedoController;
|
||||
struct SearchMatch;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "utility/logging/logging.h"
|
||||
#include "utility/TimePoint.h"
|
||||
#include "utility/utilityApp.h"
|
||||
#include "utility/utility.h"
|
||||
|
||||
std::string SharedMemoryGarbageCollector::s_memoryNamePrefix = "grbg_cllctr_";
|
||||
std::string SharedMemoryGarbageCollector::s_instancesKeyName = "running_instances";
|
||||
|
||||
@@ -5,6 +5,17 @@
|
||||
|
||||
#include "boost/date_time/time_clock.hpp"
|
||||
|
||||
|
||||
ApplicationArchitectureType utility::getApplicationArchitectureType()
|
||||
{
|
||||
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64) || defined(WIN64)
|
||||
return APPLICATION_ARCHITECTURE_X86_64;
|
||||
#else
|
||||
return APPLICATION_ARCHITECTURE_X86_32;
|
||||
#endif
|
||||
return APPLICATION_ARCHITECTURE_UNKNOWN;
|
||||
}
|
||||
|
||||
TimePoint utility::durationStart()
|
||||
{
|
||||
return TimePoint::now();
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include "boost/date_time/posix_time/posix_time.hpp"
|
||||
|
||||
#include "utility/ApplicationArchitectureType.h"
|
||||
#include "utility/file/FilePath.h"
|
||||
#include "utility/math/Vector2.h"
|
||||
#include "utility/TimePoint.h"
|
||||
@@ -92,6 +93,8 @@ namespace utility
|
||||
return a.size() + b.size() != c.size();
|
||||
}
|
||||
|
||||
ApplicationArchitectureType getApplicationArchitectureType();
|
||||
|
||||
bool intersectionPoint(Vec2f a1, Vec2f b1, Vec2f a2, Vec2f b2, Vec2f* i);
|
||||
|
||||
size_t digits(size_t n);
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "utility/ResourcePaths.h"
|
||||
#include "utility/utilityPathDetection.h"
|
||||
#include "utility/utilityApp.h"
|
||||
#include "utility/utility.h"
|
||||
|
||||
QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
|
||||
QtProjectWizzardWindow* window
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -14,8 +14,6 @@ namespace utility
|
||||
|
||||
void killRunningProcesses();
|
||||
|
||||
ApplicationArchitectureType getApplicationArchitectureType();
|
||||
|
||||
int getIdealThreadCount();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user