[email protected] 8 лет назад
Родитель
Сommit
fd63e32084
2 измененных файлов с 36 добавлено и 1 удалено
  1. 35 0
      oxygine/src/oxygine/core/oxygine.cpp
  2. 1 1
      tools/others/update_examples_entry.py

+ 35 - 0
oxygine/src/oxygine/core/oxygine.cpp

@@ -95,6 +95,39 @@ void emscStackTrace()
 #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
 {
     static ThreadDispatcher _threadMessages;
@@ -210,6 +243,8 @@ namespace oxygine
             t += "DEBUG ";
 #endif
 
+            t += "arch " + std::string(ABI);
+
             log::messageln("build settings %s", t.c_str());
 
             init0();

+ 1 - 1
tools/others/update_examples_entry.py

@@ -15,7 +15,7 @@ items = (
     examples + "Game/Part5",
     examples + "HelloWorld",
     examples + "Match3",
-    parent + "oxygine-freetype/example/game/project/",
+    parent + "oxygine-freetype/examples/HelloFreeType/",
     parent + "oxygine-sound/examples/SoundDemo/",
     parent + "oxygine-flow/examples/HelloFlow/",
     parent + "oxygine-game/my_awesome_game/project/src/",