|
@@ -95,6 +95,39 @@ void emscStackTrace()
|
|
|
#define LOST_RESET_CONTEXT 0
|
|
#define LOST_RESET_CONTEXT 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+#if defined(__arm__)
|
|
|
|
|
+#if defined(__ARM_ARCH_7A__)
|
|
|
|
|
+#if defined(__ARM_NEON__)
|
|
|
|
|
+#if defined(__ARM_PCS_VFP)
|
|
|
|
|
+#define ABI "armeabi-v7a/NEON (hard-float)"
|
|
|
|
|
+#else
|
|
|
|
|
+#define ABI "armeabi-v7a/NEON"
|
|
|
|
|
+#endif
|
|
|
|
|
+#else
|
|
|
|
|
+#if defined(__ARM_PCS_VFP)
|
|
|
|
|
+#define ABI "armeabi-v7a (hard-float)"
|
|
|
|
|
+#else
|
|
|
|
|
+#define ABI "armeabi-v7a"
|
|
|
|
|
+#endif
|
|
|
|
|
+#endif
|
|
|
|
|
+#else
|
|
|
|
|
+#define ABI "armeabi"
|
|
|
|
|
+#endif
|
|
|
|
|
+#elif defined(__i386__)
|
|
|
|
|
+#define ABI "x86"
|
|
|
|
|
+#elif defined(__x86_64__)
|
|
|
|
|
+#define ABI "x86_64"
|
|
|
|
|
+#elif defined(__mips64) /* mips64el-* toolchain defines __mips__ too */
|
|
|
|
|
+#define ABI "mips64"
|
|
|
|
|
+#elif defined(__mips__)
|
|
|
|
|
+#define ABI "mips"
|
|
|
|
|
+#elif defined(__aarch64__)
|
|
|
|
|
+#define ABI "arm64-v8a"
|
|
|
|
|
+#else
|
|
|
|
|
+#define ABI "unknown"
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
namespace oxygine
|
|
namespace oxygine
|
|
|
{
|
|
{
|
|
|
static ThreadDispatcher _threadMessages;
|
|
static ThreadDispatcher _threadMessages;
|
|
@@ -210,6 +243,8 @@ namespace oxygine
|
|
|
t += "DEBUG ";
|
|
t += "DEBUG ";
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+ t += "arch " + std::string(ABI);
|
|
|
|
|
+
|
|
|
log::messageln("build settings %s", t.c_str());
|
|
log::messageln("build settings %s", t.c_str());
|
|
|
|
|
|
|
|
init0();
|
|
init0();
|