projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get progress during formatting.
[dcpomatic.git]
/
src
/
lib
/
environment_info.cc
diff --git
a/src/lib/environment_info.cc
b/src/lib/environment_info.cc
index 68496f9965da300415928d7d21558ea3ffda9fd5..5b1f56f727e279122211616742cb4598ad0cce32 100644
(file)
--- a/
src/lib/environment_info.cc
+++ b/
src/lib/environment_info.cc
@@
-35,13
+35,10
@@
extern "C" {
#include "i18n.h"
#include "i18n.h"
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
using std::string;
using std::list;
using std::pair;
using std::string;
using std::list;
using std::pair;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
/** @param v Version as used by FFmpeg.
* @return A string representation of v.
/** @param v Version as used by FFmpeg.
* @return A string representation of v.
@@
-128,9
+125,11
@@
environment_info ()
#if __GNUC__
#if __x86_64__
#if __GNUC__
#if __x86_64__
- info.push_back ("Built for 64-bit");
+ info.push_back ("Built for x86 64-bit");
+#elif __aarch64__
+ info.push_back ("Built for ARM 64-bit");
#else
#else
- info.push_back ("Built for 32-bit");
+ info.push_back ("Built for
x86
32-bit");
#endif
#endif
#endif
#endif